From 632a23c084f8c6e3deca0e312b88e2cf2b0ad5e5 Mon Sep 17 00:00:00 2001
From: Persson-dev <sim16.prib@gmail.com>
Date: Tue, 23 Jul 2024 01:17:51 +0200
Subject: [PATCH] refactor xmake.lua

---
 xmake.lua | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/xmake.lua b/xmake.lua
index 8a4f46b..c716c4b 100644
--- a/xmake.lua
+++ b/xmake.lua
@@ -10,20 +10,25 @@ if is_mode("release") then
     set_warnings("all", "error")
 end
 
-target("BlitzLib")
-    set_kind("static")
-    add_files("src/blitz/**.cpp", "src/client/**.cpp", "src/server/**.cpp")
-    add_includedirs("include")
-    add_packages("nazaraengine")
+add_includedirs("include")
 
 target("Blitz2")
-    set_kind("binary")
-    add_files("src/*.cpp")
-    add_packages("nazaraengine")
-    add_includedirs("include")
-    add_deps("BlitzLib")
-    set_rundir(".")
+    set_kind("static")
+    add_files("src/blitz/**.cpp", "src/server/**.cpp")
+    add_packages("nazaraengine", {public = true})
 
+target("Blitz2Server")
+    set_kind("binary")
+    add_deps("Blitz2")
+    set_default(false)
+    add_files("src/ServerMain.cpp")
+
+
+target("Blitz2Client")
+    set_kind("binary")
+    add_files("src/ClientMain.cpp", "src/client/**.cpp")
+    add_deps("Blitz2")
+    set_rundir(".")
 
 
 -- Tests were introduced in that version
@@ -35,13 +40,11 @@ for _, file in ipairs(os.files("test/**.cpp")) do
     target(name)
         set_kind("binary")
 
-        add_includedirs("include", "test")
         add_files(file)
 
         set_default(false)
 
-        add_deps("BlitzLib")
-        add_packages("nazaraengine")
+        add_deps("Blitz2")
 
         add_tests("compile_and_run")
 end