Restructured xmake files

Mostly: moved dependencies to the module which introduces them

6 files changed, 48 insertions, 15 deletions

diff --git a/xmake.lua b/xmake.lua
index 6ca5eb044..7f04421f7 100644
--- a/xmake.lua
+++ b/xmake.lua
@@ -1,8 +1,26 @@
-add_requires("vcpkg::doctest", "vcpkg::spdlog", "vcpkg::gsl-lite", "vcpkg::asio", "vcpkg::cpr", "vcpkg::xxhash", "vcpkg::robin-map", "vcpkg::lz4", "vcpkg::fmt")
-add_requires("vcpkg::cxxopts", "vcpkg::mimalloc", "vcpkg::sol2", "vcpkg::sentry-native", "vcpkg::json11")
-add_requires("vcpkg::lua", "vcpkg::curl", "vcpkg::zlib", "vcpkg::zstd", "vcpkg::http-parser")
+add_requires(
+    "vcpkg::doctest", 
+    "vcpkg::spdlog", 
+    "vcpkg::gsl-lite", 
+    "vcpkg::asio", 
+    "vcpkg::cpr", 
+    "vcpkg::xxhash", 
+    "vcpkg::robin-map", 
+    "vcpkg::lz4", 
+    "vcpkg::fmt", 
+    "vcpkg::cxxopts", 
+    "vcpkg::mimalloc", 
+    "vcpkg::sol2", 
+    "vcpkg::sentry-native", 
+    "vcpkg::json11",
+    "vcpkg::lua", 
+    "vcpkg::curl", 
+    "vcpkg::zlib", 
+    "vcpkg::zstd", 
+    "vcpkg::http-parser")
 
 add_rules("mode.debug", "mode.release")
+
 if is_mode("release") then
     set_optimize("smallest")
     if is_plat("windows") then
@@ -14,22 +32,21 @@ if is_mode("debug") then
     add_defines("DEBUG")
 end
 
-add_defines("UNICODE")
-add_linkdirs("$(projectdir)/3rdparty/BLAKE3/lib/Win64", "$(projectdir)/3rdparty/Oodle/lib/Win64")
+add_defines("UNICODE", "_CONSOLE")
 
 set_warnings("allextra", "error")
 set_languages("cxx20")
 
 set_symbols("debug")
 
-add_packages("vcpkg::doctest", "vcpkg::spdlog", "vcpkg::gsl-lite", "vcpkg::asio", "vcpkg::cpr", "vcpkg::xxhash", "vcpkg::robin-map", "vcpkg::lz4", "vcpkg::fmt")
-add_packages("vcpkg::cxxopts", "vcpkg::mimalloc", "vcpkg::sol2", "vcpkg::sentry-native", "vcpkg::json11")
-add_packages("vcpkg::lua", "vcpkg::curl", "vcpkg::zlib", "vcpkg::zstd", "vcpkg::http-parser")
+add_packages(
+    "vcpkg::cxxopts",
+    "vcpkg::mimalloc")
 
 includes("zencore/xmake.lua")
+includes("zencore-test/xmake.lua")
 includes("zenstore/xmake.lua")
 includes("zenutil/xmake.lua")
-includes("zencore-test/xmake.lua")
 includes("zenserver/xmake.lua")
 includes("zenserver-test/xmake.lua")
 includes("zen/xmake.lua")
diff --git a/zen/xmake.lua b/zen/xmake.lua
index 4dc1307d0..6f574df74 100644
--- a/zen/xmake.lua
+++ b/zen/xmake.lua
@@ -13,4 +13,5 @@ target("zen")
         add_ldflags("/subsystem:console,5.02")
         add_ldflags("/LTCG")
     end
-    
\ No newline at end of file
+
+    add_packages("vcpkg::zstd")
diff --git a/zencore-test/xmake.lua b/zencore-test/xmake.lua
index e335cad37..61421f292 100644
--- a/zencore-test/xmake.lua
+++ b/zencore-test/xmake.lua
@@ -1,7 +1,4 @@
 target("zencore-test")
     set_kind("binary")
     add_files("*.cpp")
-    add_includedirs("..\\3rdparty\\utfcpp\\source")
     add_deps("zencore")
-    add_links("BLAKE3")
-    set_symbols("debug")
diff --git a/zencore/xmake.lua b/zencore/xmake.lua
index 39eb4590e..5de7f476d 100644
--- a/zencore/xmake.lua
+++ b/zencore/xmake.lua
@@ -3,4 +3,14 @@ target('zencore')
     add_files("**.cpp")
     add_includedirs("include", {public=true})
     add_includedirs("..\\3rdparty\\utfcpp\\source")
-
+    add_linkdirs("$(projectdir)/3rdparty/BLAKE3/lib/Win64", "$(projectdir)/3rdparty/Oodle/lib/Win64")
+    add_packages(
+        "vcpkg::spdlog", 
+        "vcpkg::fmt",
+        "vcpkg::doctest", 
+        "vcpkg::lz4",
+        "vcpkg::cpr",
+        "vcpkg::curl",  -- required by cpr
+        "vcpkg::zlib",  -- required by curl
+        "vcpkg::xxhash", 
+        "vcpkg::gsl-lite")
diff --git a/zenserver-test/xmake.lua b/zenserver-test/xmake.lua
index aa83c3e38..a7d696959 100644
--- a/zenserver-test/xmake.lua
+++ b/zenserver-test/xmake.lua
@@ -2,3 +2,4 @@ target("zenserver-test")
     set_kind("binary")
     add_files("*.cpp")
     add_deps("zencore", "zenutil")
+    add_packages("vcpkg::http-parser")
diff --git a/zenserver/xmake.lua b/zenserver/xmake.lua
index 5c994a3a7..8319dedec 100644
--- a/zenserver/xmake.lua
+++ b/zenserver/xmake.lua
@@ -15,4 +15,11 @@ target("zenserver")
         add_ldflags("/MANIFESTUAC:level='requireAdministrator'")
         add_ldflags("/LTCG")
     end
-    
\ No newline at end of file
+    
+    add_packages(
+        "vcpkg::sentry-native",             
+        "vcpkg::sol2", 
+        "vcpkg::lua",
+        "vcpkg::asio",
+        "vcpkg::json11"
+    )
\ No newline at end of file