diff options
| author | Stefan Boberg <[email protected]> | 2025-10-25 14:58:48 +0200 |
|---|---|---|
| committer | Stefan Boberg <[email protected]> | 2025-10-25 14:58:48 +0200 |
| commit | 154e35ee29b63155958110ea687cce849a3beb25 (patch) | |
| tree | 536dff352369aaebe3fa14e3b4584be497c3835b | |
| parent | in-tree: lz4 (in-tree xrepo) (diff) | |
| download | zen-154e35ee29b63155958110ea687cce849a3beb25.tar.xz zen-154e35ee29b63155958110ea687cce849a3beb25.zip | |
in-tree: lua (in-tree xrepo)
| -rw-r--r-- | src/zenserver/xmake.lua | 12 | ||||
| -rw-r--r-- | xmake.lua | 4 |
2 files changed, 7 insertions, 9 deletions
diff --git a/src/zenserver/xmake.lua b/src/zenserver/xmake.lua index c3ed22084..dd46a5627 100644 --- a/src/zenserver/xmake.lua +++ b/src/zenserver/xmake.lua @@ -18,8 +18,12 @@ target("zenserver") add_includedirs(".") set_symbols("debug") - add_deps("protozero", "asio", "cxxopts", "sol2") + add_deps("protozero", "asio", "cxxopts") + add_deps("sol2") add_deps("json11") + add_packages("lua") + + add_packages("vcpkg::mimalloc") if is_mode("release") then set_optimize("fastest") @@ -49,12 +53,6 @@ target("zenserver") add_options("compute") add_options("exec") - add_packages( - "vcpkg::http-parser", - "vcpkg::lua", - "vcpkg::mimalloc" - ) - -- to work around some unfortunate Ctrl-C behaviour on Linux/Mac due to -- our use of setsid() at startup we pass in `--no-detach` to zenserver -- ensure that it recieves signals when the user requests termination @@ -5,14 +5,14 @@ set_configvar("ZEN_SCHEMA_VERSION", 5) -- force state wipe after 0.2.31 causing add_repositories("zen-repo repo") add_requires("xxhash 0.8.2", {system = false}) -add_requires("lz4") +add_requires("lz4", {system = false}) +add_requires("lua", {system = false}) add_requires( "vcpkg::curl", "vcpkg::eastl", "vcpkg::gsl-lite", "vcpkg::http-parser", - "vcpkg::lua", "vcpkg::ryml", "vcpkg::c4core", "vcpkg::zlib" |