diff options
| author | Stefan Boberg <[email protected]> | 2025-10-15 22:03:56 +0200 |
|---|---|---|
| committer | GitHub Enterprise <[email protected]> | 2025-10-15 22:03:56 +0200 |
| commit | 5c3ead7d717512aaae237d9009c312e3f61d154d (patch) | |
| tree | 3ff3716d77d5102a354b08eba8ec729019fc0626 /src/zencore/xmake.lua | |
| parent | move file i/o related files to separate file and remove duplicated code (#576) (diff) | |
| download | zen-5c3ead7d717512aaae237d9009c312e3f61d154d.tar.xz zen-5c3ead7d717512aaae237d9009c312e3f61d154d.zip | |
added separate xmake.lua for thirdparty (#578)
Moves out third-party stuff from zencore
Establishes new pattern for incorporating thirdparty code. The integration is cleaner, clearer and also surfaces the code in the generated .sln
Diffstat (limited to 'src/zencore/xmake.lua')
| -rw-r--r-- | src/zencore/xmake.lua | 30 |
1 files changed, 7 insertions, 23 deletions
diff --git a/src/zencore/xmake.lua b/src/zencore/xmake.lua index b3a33e052..fcb2afaf7 100644 --- a/src/zencore/xmake.lua +++ b/src/zencore/xmake.lua @@ -5,6 +5,7 @@ target('zencore') set_group("libs") add_options("zentrace", "zenmimalloc", "zenrpmalloc") add_headerfiles("**.h") + add_includedirs("include", {public=true}) add_configfiles("include/zencore/config.h.in") on_load(function (target) local version = io.readfile("VERSION.txt") @@ -16,36 +17,19 @@ target('zencore') add_files("trace.cpp", {unity_ignored = true }) if has_config("zenrpmalloc") then - set_languages("c17", "cxx20") - if is_os("windows") then - add_cflags("/experimental:c11atomics") - end - add_defines("RPMALLOC_FIRST_CLASS_HEAPS=1", "ENABLE_STATISTICS=1", "ENABLE_OVERRIDE=0") - add_files("$(projectdir)/thirdparty/rpmalloc/rpmalloc.c") + add_deps("rpmalloc") end if has_config("zenmimalloc") then add_packages("vcpkg::mimalloc") end - add_includedirs("include", {public=true}) - add_includedirs("$(projectdir)/thirdparty/GetTimeSinceProcessStart") - add_includedirs("$(projectdir)/thirdparty/utfcpp/source") - add_includedirs("$(projectdir)/thirdparty/Oodle/include") - add_includedirs("$(projectdir)/thirdparty/trace", {public=true}) - add_includedirs("$(projectdir)/thirdparty/rpmalloc") - 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") - add_syslinks("pthread") - elseif is_os("macosx") then - add_linkdirs("$(projectdir)/thirdparty/Oodle/lib/Mac_x64") - add_links("oo2coremac64") - end add_deps("zenbase") + add_deps("utfcpp") + add_deps("oodle") + add_deps("ue-trace") + add_deps("timesinceprocessstart") + add_packages( "vcpkg::blake3", "vcpkg::json11", |