aboutsummaryrefslogtreecommitdiff
path: root/xmake.lua
diff options
context:
space:
mode:
Diffstat (limited to 'xmake.lua')
-rw-r--r--xmake.lua9
1 files changed, 5 insertions, 4 deletions
diff --git a/xmake.lua b/xmake.lua
index 923256995..18429de61 100644
--- a/xmake.lua
+++ b/xmake.lua
@@ -73,6 +73,8 @@ add_requires("zlib", {system = false})
add_defines("EASTL_STD_ITERATOR_CATEGORY_ENABLED", "EASTL_DEPRECATIONS_FOR_2024_APRIL=EA_DISABLED")
add_requires("eastl", {system = false})
+add_requires("consul", {system = false}) -- for hub tests
+
if has_config("zenmimalloc") and not use_asan then
add_requires("mimalloc", {system = false})
end
@@ -109,7 +111,6 @@ if is_plat("linux") and os.getenv("UE_TOOLCHAIN_DIR") then
add_ldflags("$(projectdir)/thirdparty/ue-libcxx/lib64/libc++abi.a")
set_toolset("objcopy", "$(env UE_TOOLCHAIN_DIR)/bin/llvm-objcopy")
end
-
if has_config("zensentry") and not use_asan then
if is_plat("linux") then
add_requires("sentry-native 0.7.6")
@@ -119,7 +120,6 @@ if has_config("zensentry") and not use_asan then
add_requires("sentry-native 0.7.6", {configs = {backend = "crashpad"}})
end
end
-
--add_rules("c++.unity_build")
if is_mode("release") then
@@ -168,8 +168,9 @@ 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:u8EscapeEncoding") -- Enable UTF-8 encoding for u8 string literals
+ add_cxxflags("/Zc:preprocessor") -- Enable preprocessor conformance mode
+ add_cxxflags("/Zc:u8EscapeEncoding") -- Enable UTF-8 encoding for u8 string literals
+ add_cxxflags("/Zc:inline") -- Enforce inline semantics
-- add_ldflags("/MAP")
end