aboutsummaryrefslogtreecommitdiff
path: root/src/zencore/xmake.lua
diff options
context:
space:
mode:
authorStefan Boberg <[email protected]>2023-05-02 13:44:55 +0200
committerStefan Boberg <[email protected]>2023-05-02 13:44:55 +0200
commitd1fff634733fb1e2567268935521ebc4d41e80d9 (patch)
tree9753b42ab08389d7ee8acfb0e415bed78a25fdb8 /src/zencore/xmake.lua
parentmove testing and observability code to zenhttp (#266) (diff)
downloadzen-d1fff634733fb1e2567268935521ebc4d41e80d9.tar.xz
zen-d1fff634733fb1e2567268935521ebc4d41e80d9.zip
cleaned up how Oodle is incorporated
changed win64 to be more in line with other platforms wrt xmake config
Diffstat (limited to 'src/zencore/xmake.lua')
-rw-r--r--src/zencore/xmake.lua2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/zencore/xmake.lua b/src/zencore/xmake.lua
index e1e649c1d..4ec334574 100644
--- a/src/zencore/xmake.lua
+++ b/src/zencore/xmake.lua
@@ -13,9 +13,11 @@ target('zencore')
add_files("**.cpp")
add_includedirs("include", {public=true})
add_includedirs("$(projectdir)/thirdparty/utfcpp/source")
+ add_includedirs("$(projectdir)/thirdparty/Oodle/include")
add_includedirs("$(projectdir)/thirdparty/trace", {public=true})
if is_os("windows") then
add_linkdirs("$(projectdir)/thirdparty/Oodle/lib/Win64")
+ add_links("oo2core_win64")
elseif is_os("linux") then
add_linkdirs("$(projectdir)/thirdparty/Oodle/lib/Linux_x64")
add_links("oo2corelinux64")