diff options
Diffstat (limited to 'thirdparty/xmake.lua')
| -rw-r--r-- | thirdparty/xmake.lua | 33 |
1 files changed, 7 insertions, 26 deletions
diff --git a/thirdparty/xmake.lua b/thirdparty/xmake.lua index f079d803d..f929656a6 100644 --- a/thirdparty/xmake.lua +++ b/thirdparty/xmake.lua @@ -50,12 +50,6 @@ target('protozero') add_headerfiles("protozero/**.hpp") add_includedirs("protozero/include", {public=true}) -target('spdlog') - set_kind('headeronly') - set_group('thirdparty') - add_headerfiles("spdlog/include/spdlog/**.h") - add_includedirs("spdlog/include", {public=true}) - target('cpr') set_kind('static') set_group('thirdparty') @@ -66,7 +60,7 @@ target('cpr') if is_os("windows") then add_cxxflags("/wd4668") else - add_cxxflags("-Wno-undef") + add_cxxflags("-Wno-undef", "-Wno-deprecated-declarations") end add_packages("libcurl", {public=true}) @@ -86,15 +80,17 @@ target("blake3") if is_os("windows") then add_cflags("/experimental:c11atomics") - add_cflags("/wd4245") -- conversion from 'type1' to 'type2', possible loss of data + add_cflags("/wd4245", {force = true}) -- conversion from 'type1' to 'type2', possible loss of data elseif is_os("macosx") then add_cflags("-Wno-unused-function") end if is_arch("x86_64", "x64") then - if is_subhost("msys", "cygwin") then - add_files("blake3/c/*x86-64_windows_gnu.S") - elseif is_plat("windows") 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 add_files("blake3/c/*x86-64_unix.S") @@ -142,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 |