From 69869ccb741d807739bdbc4cfbff551145a7df92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Sun, 20 Mar 2022 18:58:21 +0100 Subject: [PATCH] Update xmake.lua --- xmake.lua | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/xmake.lua b/xmake.lua index 033f38188..0d433c17a 100644 --- a/xmake.lua +++ b/xmake.lua @@ -85,9 +85,6 @@ local modules = { Custom = function() -- Set precise floating-points models to ensure shader optimization leads to correct results set_fpmodels("precise") - if is_plat("macosx") then - add_packages("molten-vk") - end end }, Utility = { @@ -106,17 +103,13 @@ local modules = { add_defines("VK_USE_PLATFORM_WAYLAND_KHR") elseif is_plat("macosx") then add_defines("VK_USE_PLATFORM_METAL_EXT") - add_packages("molten-vk") + add_packages("moltenvk") end end }, Widgets = { Deps = {"NazaraGraphics"}, - Packages = {"entt", "kiwisolver"}, - Custom = function() - if is_plat("macosx") then - add_packages("molten-vk") - end + Packages = {"entt", "kiwisolver"} 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 if is_plat("macosx") then - add_requires("libx11") - add_requires("molten-vk") + add_requires("libx11", "moltenvk") end add_rules("mode.asan", "mode.coverage", "mode.debug", "mode.releasedbg")