sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix macOS compilation (#384)

Browse Source 
Disable X11 on macOS, I don't know why it's enabled
This commit is contained in:
Jérôme Leclercq
2022-11-19 13:37:42 +01:00
committed by GitHub
parent 5ca2cf9320
commit 082015a0c5
4 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
xmake.lua
View File

@@ -27,7 +27,7 @@ local rendererBackends = {
elseif is_plat("linux") then
add_defines("VK_USE_PLATFORM_XLIB_KHR")
add_defines("VK_USE_PLATFORM_WAYLAND_KHR")
add_packages("xorgproto", "libx11", "wayland", { links = {} }) -- we only need X11 and waylands headers
add_packages("libxext", "wayland", { links = {} }) -- we only need X11 and waylands headers
elseif is_plat("macosx") then
add_defines("VK_USE_PLATFORM_METAL_EXT")
add_files("src/Nazara/VulkanRenderer/**.mm")
@@ -96,10 +96,9 @@ local modules = {
elseif is_plat("linux") then
add_defines("SDL_VIDEO_DRIVER_X11=1")
add_defines("SDL_VIDEO_DRIVER_WAYLAND=1")
add_packages("xorgproto", "libx11", { links = {} }) -- we only need X11 headers
add_packages("libxext", "wayland", { links = {} }) -- we only need X11 headers
elseif is_plat("macosx") then
add_defines("SDL_VIDEO_DRIVER_COCOA=1")
add_packages("xorgproto", "libx11", { links = {} }) -- we only need X11 headers
end
end
},
@@ -162,11 +161,8 @@ add_repositories("nazara-engine-repo https://github.com/NazaraEngine/xmake-repo"
add_requires("nazarautils")
add_requires("nzsl", { debug = is_mode("debug"), configs = { with_symbols = not is_mode("release"), shared = true } })
if is_plat("linux", "macosx") then
add_requires("xorgproto", "libx11")
if is_plat("linux") then
add_requires("libuuid", "wayland")
end
if is_plat("linux") then
add_requires("libxext", "libuuid", "wayland")
end
add_rules("mode.asan", "mode.tsan", "mode.coverage", "mode.debug", "mode.releasedbg", "mode.release")