From 8884cb8bf3931321c933a2e76cd64b99c87bf414 Mon Sep 17 00:00:00 2001 From: Yuefeng Geng Date: Thu, 2 Jan 2025 18:01:08 +0800 Subject: [PATCH] Fix windows mysterious, uncharted bug --- src/core/xmake.lua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/core/xmake.lua b/src/core/xmake.lua index a086d37c3..5135647c1 100644 --- a/src/core/xmake.lua +++ b/src/core/xmake.lua @@ -15,7 +15,7 @@ on_load(function(target) if is_mode("debug") then target:add("syslinks", "Dbghelp") end - target:add("defines", "NOMINMAX", "LUISA_PLATFORM_WINDOWS", { + target:add("defines", "NOMINMAX", "LUISA_PLATFORM_WINDOWS", "_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR", { public = true }) elseif is_plat("linux") then @@ -39,7 +39,9 @@ on_load(function(target) target:add("deps", "eastl", "spdlog", "lc-check-winsdk") local marl_path = path.join(os.scriptdir(), "../ext/marl") if (not get_config("external_marl")) and (os.exists(marl_path)) then - target:add("defines", "MARL_DLL", {public = true}) + target:add("defines", "MARL_DLL", { + public = true + }) target:add("defines", "MARL_BUILDING_DLL") target:add("files", path.join(marl_path, "src/*.c"), path.join(marl_path, "src/build.marl.cpp")) if not is_plat("windows") then