diff options
Diffstat (limited to 'xmake.lua')
| -rw-r--r-- | xmake.lua | 20 |
1 files changed, 9 insertions, 11 deletions
@@ -3,9 +3,7 @@ set_configvar("ZEN_SCHEMA_VERSION", 5) -- force state wipe after 0.2.31 causing bad data (dan.engelbrecht) add_requires( - "vcpkg::asio", "vcpkg::blake3", - "vcpkg::cpr", "vcpkg::curl", "vcpkg::cxxopts", "vcpkg::doctest", @@ -24,13 +22,13 @@ add_requires( "vcpkg::zlib" ) -add_defines("EASTL_STD_ITERATOR_CATEGORY_ENABLED") +add_defines("EASTL_STD_ITERATOR_CATEGORY_ENABLED", "EASTL_DEPRECATIONS_FOR_2024_APRIL=EA_DISABLED") set_policy("build.ccache", false) if is_plat("windows") then add_defines("ZEN_USE_OPENSSL=0") -else +else add_requires("vcpkg::openssl") end @@ -40,7 +38,7 @@ if is_plat("windows") then end -- If we're using the UE cross-compile toolchain, we need to ensure we link statically --- against the toolchain libc++ and libc++abi, as the system ones can differ in ABI +-- against the toolchain libc++ and libc++abi, as the system ones can differ in ABI -- leading to nasty crashes if is_plat("linux") and "$(env UE_TOOLCHAIN_DIR)" ~= "" then add_ldflags("-static-libstdc++") @@ -104,7 +102,7 @@ if is_os("windows") then add_cxxflags("/experimental:deterministic") -- (more) deterministic compiler output add_ldflags("/PDBALTPATH:%_PDB%") -- deterministic pdb reference in exe - add_cxxflags("/Zc:preprocessor") -- Enable preprocessor conformance mode + add_cxxflags("/Zc:preprocessor") -- Enable preprocessor conformance mode -- add_ldflags("/MAP") end @@ -121,7 +119,7 @@ if is_os("linux") or is_os("macosx") then end if is_os("macosx") then - -- silence warnings about -Wno-vla-cxx-extension since to my knowledge we can't + -- silence warnings about -Wno-vla-cxx-extension since to my knowledge we can't -- detect the clang version used in Xcode and only recent versions contain this flag add_cxxflags("-Wno-unknown-warning-option") end @@ -275,7 +273,7 @@ task("test") import("core.base.option") import("core.project.config") import("core.project.project") - + config.load() local testname = option.get("run") @@ -292,15 +290,15 @@ task("test") local arch if is_host("windows") then arch = "x64" - elseif is_arch("arm64") then + elseif is_arch("arm64") then arch = "arm64" else arch = "x86_64" end - + print(os.exec("xmake config -c -m debug -a "..arch)) print(os.exec("xmake")) - + local tests = {} local found_match = false |