Update xmake.lua

This commit is contained in:
Jérôme Leclercq 2022-03-20 18:58:21 +01:00
parent b6290070cb
commit 69869ccb74
1 changed files with 3 additions and 11 deletions

View File

@ -85,9 +85,6 @@ local modules = {
Custom = function() Custom = function()
-- Set precise floating-points models to ensure shader optimization leads to correct results -- Set precise floating-points models to ensure shader optimization leads to correct results
set_fpmodels("precise") set_fpmodels("precise")
if is_plat("macosx") then
add_packages("molten-vk")
end
end end
}, },
Utility = { Utility = {
@ -106,17 +103,13 @@ local modules = {
add_defines("VK_USE_PLATFORM_WAYLAND_KHR") add_defines("VK_USE_PLATFORM_WAYLAND_KHR")
elseif is_plat("macosx") then elseif is_plat("macosx") then
add_defines("VK_USE_PLATFORM_METAL_EXT") add_defines("VK_USE_PLATFORM_METAL_EXT")
add_packages("molten-vk") add_packages("moltenvk")
end end
end end
}, },
Widgets = { Widgets = {
Deps = {"NazaraGraphics"}, Deps = {"NazaraGraphics"},
Packages = {"entt", "kiwisolver"}, Packages = {"entt", "kiwisolver"}
Custom = function()
if is_plat("macosx") then
add_packages("molten-vk")
end
end end
} }
@ -148,8 +141,7 @@ add_requires("openal-soft", { configs = { shared = true }})
add_requires("newtondynamics", { debug = is_plat("windows") and is_mode("debug") }) -- Newton doesn't like compiling in Debug on Linux add_requires("newtondynamics", { debug = is_plat("windows") and is_mode("debug") }) -- Newton doesn't like compiling in Debug on Linux
if is_plat("macosx") then if is_plat("macosx") then
add_requires("libx11") add_requires("libx11", "moltenvk")
add_requires("molten-vk")
end end
add_rules("mode.asan", "mode.coverage", "mode.debug", "mode.releasedbg") add_rules("mode.asan", "mode.coverage", "mode.debug", "mode.releasedbg")