aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Ridgers <[email protected]>2021-12-15 09:10:45 +0100
committerMartin Ridgers <[email protected]>2021-12-15 09:10:45 +0100
commit60dd4a5d71f3c8c66b8a6a38c3a12e45ba133176 (patch)
treecc7a90afa5cb892fcc0d1ae1f947ffaad88b0341
parentDeleted file that mysteriously returned via a merge (diff)
downloadzen-60dd4a5d71f3c8c66b8a6a38c3a12e45ba133176.tar.xz
zen-60dd4a5d71f3c8c66b8a6a38c3a12e45ba133176.zip
Setting include dir paths under an option does not work in xmake >=2.6
-rw-r--r--xmake.lua1
-rw-r--r--zencore/xmake.lua1
2 files changed, 1 insertions, 1 deletions
diff --git a/xmake.lua b/xmake.lua
index c1aef5f85..06307b479 100644
--- a/xmake.lua
+++ b/xmake.lua
@@ -120,7 +120,6 @@ option("zentrace")
set_default(false)
set_showmenu(true)
set_description("Enable UE's Trace support")
- add_includedirs("thirdparty/trace")
option_end()
add_define_by_config("ZEN_WITH_TRACE", "zentrace")
diff --git a/zencore/xmake.lua b/zencore/xmake.lua
index 6f99b78d5..a9e9ad85c 100644
--- a/zencore/xmake.lua
+++ b/zencore/xmake.lua
@@ -4,6 +4,7 @@ target('zencore')
add_files("**.cpp")
add_includedirs("include", {public=true})
add_includedirs("$(projectdir)/thirdparty/utfcpp/source")
+ add_includedirs("$(projectdir)/thirdparty/trace", {public=true})
if is_os("windows") then
add_linkdirs("$(projectdir)/thirdparty/BLAKE3/lib/Win64")
add_linkdirs("$(projectdir)/thirdparty/Oodle/lib/Win64")