Skip to content

Commit

Permalink
Fix windows mysterious, uncharted bug
Browse files Browse the repository at this point in the history
  • Loading branch information
MaxwellGengYF committed Jan 2, 2025
1 parent 7491303 commit 8884cb8
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions src/core/xmake.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 8884cb8

Please sign in to comment.