aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/zen/xmake.lua2
-rw-r--r--xmake.lua4
2 files changed, 4 insertions, 2 deletions
diff --git a/src/zen/xmake.lua b/src/zen/xmake.lua
index f36573d62..3561b8de8 100644
--- a/src/zen/xmake.lua
+++ b/src/zen/xmake.lua
@@ -3,7 +3,7 @@
target("zen")
set_kind("binary")
add_headerfiles("**.h")
- add_files("**.cpp")
+ add_files("**.cpp", {unity_ignored = true })
add_files("zen.cpp", {unity_ignored = true })
add_deps("zencore", "zenhttp", "zenremotestore", "zenstore", "zenutil")
add_includedirs(".")
diff --git a/xmake.lua b/xmake.lua
index 7242c61ab..8d77ae8bb 100644
--- a/xmake.lua
+++ b/xmake.lua
@@ -61,7 +61,7 @@ if has_config("zensentry") then
end
add_rules("mode.debug", "mode.release")
---add_rules("c++.unity_build")
+add_rules("c++.unity_build")
if is_mode("release") then
-- LTO does not appear to work with the current UE toolchain
@@ -102,6 +102,8 @@ if is_os("windows") then
-- Make builds more deterministic and portable
add_cxxflags("/d1trimfile:$(curdir)\\") -- eliminates the base path from __FILE__ paths
add_cxxflags("/experimental:deterministic") -- (more) deterministic compiler output
+ add_cxxflags("/bigobj") -- support more sections
+
add_ldflags("/PDBALTPATH:%_PDB%") -- deterministic pdb reference in exe
add_cxxflags("/Zc:preprocessor") -- Enable preprocessor conformance mode