diff options
| author | Stefan Boberg <[email protected]> | 2026-02-24 15:02:58 +0100 |
|---|---|---|
| committer | GitHub Enterprise <[email protected]> | 2026-02-24 15:02:58 +0100 |
| commit | 2af00d3ff720969fb3b4d471778efcf8c7b3fad4 (patch) | |
| tree | 9193eb3ff8cc9f3fb5e3342d94bde8c193a977ce /thirdparty/xmake.lua | |
| parent | added zencore/filesystem.h include (diff) | |
| parent | Various bug fixes (#778) (diff) | |
| download | zen-sb/spdlog-out.tar.xz zen-sb/spdlog-out.zip | |
Merge branch 'main' into sb/spdlog-outsb/spdlog-out
Diffstat (limited to 'thirdparty/xmake.lua')
| -rw-r--r-- | thirdparty/xmake.lua | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/thirdparty/xmake.lua b/thirdparty/xmake.lua index 20c8ac4d8..cfd6976b0 100644 --- a/thirdparty/xmake.lua +++ b/thirdparty/xmake.lua @@ -86,6 +86,10 @@ target("blake3") end if is_arch("x86_64", "x64") then + -- sbo: this breaks when using MINGW on windows (which is what you get in Git Bash), so just disable it + -- if is_subhost("msys", "cygwin") then + -- add_files("blake3/c/*x86-64_windows_gnu.S") + -- elseif is_plat("windows") then if is_plat("windows") then add_files("blake3/c/*x86-64_windows_msvc.asm") else @@ -134,18 +138,3 @@ target("fmt") add_headerfiles("fmt/include/**.h") add_includedirs("fmt/include", {public=true}) -target("ryml") - set_kind("static") - set_group("thirdparty") - add_files("ryml/src/**.cpp") - add_files("ryml/ext/c4core/src/c4/*.cpp") - add_headerfiles("ryml/ext/c4core/src/**.hpp") - add_headerfiles("ryml/src/**.hpp") - add_includedirs("ryml/src", {public=true}) - add_includedirs("ryml/ext/c4core/src", {public=true}) - - if is_os("windows") then - add_cxxflags("/wd4668") -- 'symbol' : undefined macro is treated as '0' in '#if/#elif' preprocessor directives - else - add_cxxflags("-Wno-unused-but-set-variable", "-Wno-undef") - end |