diff options
| author | Stefan Boberg <[email protected]> | 2026-03-15 22:53:37 +0100 |
|---|---|---|
| committer | Stefan Boberg <[email protected]> | 2026-03-15 22:53:37 +0100 |
| commit | da216166aab918bc93ee73040c1eb6336ea6d026 (patch) | |
| tree | 87263e1e70d975c640981a50474290cdad1382cc /thirdparty/xmake.lua | |
| parent | Change --noclean to --clean in toolchain verify script (diff) | |
| parent | Merge branch 'main' into sb/linux-build-improvements (diff) | |
| download | zen-sb/linux-build-improvements.tar.xz zen-sb/linux-build-improvements.zip | |
Merge branch 'sb/linux-build-improvements' of ssh://arn-wd-l1704.localdomain:2222/ue-foundation/zen into sb/linux-build-improvementssb/linux-build-improvements
Diffstat (limited to 'thirdparty/xmake.lua')
| -rw-r--r-- | thirdparty/xmake.lua | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/thirdparty/xmake.lua b/thirdparty/xmake.lua index 3e8d88c5d..013ed8de3 100644 --- a/thirdparty/xmake.lua +++ b/thirdparty/xmake.lua @@ -37,7 +37,7 @@ target('rpmalloc') set_group('thirdparty') set_languages("c17", "cxx20") if is_os("windows") then - add_cflags("/experimental:c11atomics", {force=true}) + add_cflags("/experimental:c11atomics", {force=true, tools="cl"}) end add_defines("RPMALLOC_FIRST_CLASS_HEAPS=1", "ENABLE_STATISTICS=1", "ENABLE_OVERRIDE=0") add_files("rpmalloc/rpmalloc.c") @@ -84,7 +84,7 @@ target("blake3") add_includedirs("blake3/c", {public=true}) if is_os("windows") then - add_cflags("/experimental:c11atomics") + add_cflags("/experimental:c11atomics", {tools="cl"}) add_cflags("/wd4245", {force = true}) -- conversion from 'type1' to 'type2', possible loss of data elseif is_os("macosx") then add_cflags("-Wno-unused-function") |