add utils.merge.archive rule

6 files changed, 22 insertions, 38 deletions

diff --git a/tests/projects/other/merge_static_library/src/add.c b/tests/projects/other/merge_archive/src/add.c
index be1e084fc..be1e084fc 100644
--- a/tests/projects/other/merge_static_library/src/add.c
+++ b/tests/projects/other/merge_archive/src/add.c
diff --git a/tests/projects/other/merge_static_library/src/mul.c b/tests/projects/other/merge_archive/src/mul.c
index c4292f9aa..c4292f9aa 100644
--- a/tests/projects/other/merge_static_library/src/mul.c
+++ b/tests/projects/other/merge_archive/src/mul.c
diff --git a/tests/projects/other/merge_static_library/src/sub.c b/tests/projects/other/merge_archive/src/sub.c
index b151ec4bc..b151ec4bc 100644
--- a/tests/projects/other/merge_static_library/src/sub.c
+++ b/tests/projects/other/merge_archive/src/sub.c
diff --git a/tests/projects/other/merge_static_library/test.lua b/tests/projects/other/merge_archive/test.lua
index b76241be2..b76241be2 100644
--- a/tests/projects/other/merge_static_library/test.lua
+++ b/tests/projects/other/merge_archive/test.lua
diff --git a/tests/projects/other/merge_archive/xmake.lua b/tests/projects/other/merge_archive/xmake.lua
new file mode 100644
index 000000000..81b22c5e0
--- /dev/null
+++ b/tests/projects/other/merge_archive/xmake.lua
@@ -0,0 +1,22 @@
+add_rules("mode.debug", "mode.release")
+
+target("add")
+    set_kind("static")
+    add_files("src/add.c") 
+    set_targetdir("$(buildir)/merge_archive")
+
+target("sub")
+    set_kind("static")
+    add_files("src/sub.c") 
+    set_targetdir("$(buildir)/merge_archive")
+
+target("mul")
+    set_kind("static")
+    add_deps("add", "sub")
+    add_files("src/mul.c") 
+    if is_plat("windows") then
+        add_files("$(buildir)/merge_archive/*.lib")
+    else
+        add_files("$(buildir)/merge_archive/*.a")
+    end
+
diff --git a/tests/projects/other/merge_static_library/xmake.lua b/tests/projects/other/merge_static_library/xmake.lua
deleted file mode 100644
index 729648ca2..000000000
--- a/tests/projects/other/merge_static_library/xmake.lua
+++ /dev/null
@@ -1,38 +0,0 @@
--- add rules
-add_rules("mode.debug", "mode.release")
-
--- add target
-target("add")
-
-    -- set kind
-    set_kind("static")
-
-    -- add files
-    add_files("src/add.c") 
-
--- add target
-target("sub")
-
-    -- set kind
-    set_kind("static")
-
-    -- add files
-    add_files("src/sub.c") 
-
--- add target
-target("mul")
-
-    -- set kind
-    set_kind("static")
-
-    -- add deps
-    add_deps("add", "sub")
-
-    -- add files
-    add_files("src/mul.c") 
-    add_files("build/libadd.a")
-    add_files("build/libsub.a")
-
-    -- add link directory
-    add_linkdirs("$(buildir)")
-