diff options
| author | Stefan Boberg <[email protected]> | 2021-09-07 11:04:35 +0200 |
|---|---|---|
| committer | Stefan Boberg <[email protected]> | 2021-09-07 11:04:35 +0200 |
| commit | ea3e977f4fed42077bca0a3d3b2702e590bce560 (patch) | |
| tree | 5c8538a513cdc3a8121e84acbb0c4d03ae090397 | |
| parent | Added compilation switch for vfs related code (diff) | |
| download | zen-ea3e977f4fed42077bca0a3d3b2702e590bce560.tar.xz zen-ea3e977f4fed42077bca0a3d3b2702e590bce560.zip | |
Further xmake file cleanup
| -rw-r--r-- | xmake.lua | 24 | ||||
| -rw-r--r-- | zen/xmake.lua | 1 | ||||
| -rw-r--r-- | zencore-test/xmake.lua | 1 | ||||
| -rw-r--r-- | zenserver-test/xmake.lua | 2 | ||||
| -rw-r--r-- | zenserver/xmake.lua | 8 | ||||
| -rw-r--r-- | zenstore/xmake.lua | 1 | ||||
| -rw-r--r-- | zenutil/xmake.lua | 1 |
7 files changed, 25 insertions, 13 deletions
@@ -32,21 +32,23 @@ if is_mode("debug") then add_defines("DEBUG") end +add_defines("USE_SENTRY=1") + +option("vfs") + set_showmenu(true) + set_description("Enable or disable VFS functionality") + add_defines("WITH_VFS") +option_end() + add_defines("UNICODE", "_CONSOLE") set_warnings("allextra", "error") set_languages("cxx20") +-- always generate debug information set_symbols("debug") -add_packages( - "vcpkg::cxxopts", - "vcpkg::mimalloc") - -includes("zencore/xmake.lua") -includes("zencore-test/xmake.lua") -includes("zenstore/xmake.lua") -includes("zenutil/xmake.lua") -includes("zenserver/xmake.lua") -includes("zenserver-test/xmake.lua") -includes("zen/xmake.lua") +includes("zencore", "zencore-test") +includes("zenstore", "zenutil") +includes("zenserver", "zenserver-test") +includes("zen") diff --git a/zen/xmake.lua b/zen/xmake.lua index 6f574df74..5e2fce4b6 100644 --- a/zen/xmake.lua +++ b/zen/xmake.lua @@ -15,3 +15,4 @@ target("zen") end add_packages("vcpkg::zstd") + add_packages("vcpkg::cxxopts", "vcpkg::mimalloc") diff --git a/zencore-test/xmake.lua b/zencore-test/xmake.lua index 61421f292..ed4115976 100644 --- a/zencore-test/xmake.lua +++ b/zencore-test/xmake.lua @@ -2,3 +2,4 @@ target("zencore-test") set_kind("binary") add_files("*.cpp") add_deps("zencore") + add_packages("vcpkg::doctest")
\ No newline at end of file diff --git a/zenserver-test/xmake.lua b/zenserver-test/xmake.lua index a7d696959..10e287c67 100644 --- a/zenserver-test/xmake.lua +++ b/zenserver-test/xmake.lua @@ -2,4 +2,4 @@ target("zenserver-test") set_kind("binary") add_files("*.cpp") add_deps("zencore", "zenutil") - add_packages("vcpkg::http-parser") + add_packages("vcpkg::http-parser", "vcpkg::mimalloc") diff --git a/zenserver/xmake.lua b/zenserver/xmake.lua index 8319dedec..cbe021f90 100644 --- a/zenserver/xmake.lua +++ b/zenserver/xmake.lua @@ -15,6 +15,8 @@ target("zenserver") add_ldflags("/MANIFESTUAC:level='requireAdministrator'") add_ldflags("/LTCG") end + + add_options("vfs") add_packages( "vcpkg::sentry-native", @@ -22,4 +24,8 @@ target("zenserver") "vcpkg::lua", "vcpkg::asio", "vcpkg::json11" - )
\ No newline at end of file + ) + + add_packages( + "vcpkg::cxxopts", + "vcpkg::mimalloc") diff --git a/zenstore/xmake.lua b/zenstore/xmake.lua index bd76f3b2b..4359e01a0 100644 --- a/zenstore/xmake.lua +++ b/zenstore/xmake.lua @@ -3,3 +3,4 @@ target('zenstore') add_files("**.cpp") add_includedirs("include", {public=true}) add_deps("zencore") + add_packages("vcpkg::robin-map")
\ No newline at end of file diff --git a/zenutil/xmake.lua b/zenutil/xmake.lua index f4bbcd6f0..7cd29a86f 100644 --- a/zenutil/xmake.lua +++ b/zenutil/xmake.lua @@ -3,3 +3,4 @@ target('zenutil') add_files("**.cpp") add_includedirs("include", {public=true}) add_deps("zencore") + add_packages("vcpkg::spdlog")
\ No newline at end of file |