From 04ee6f0fd19d467df12287d3edfdb4146b7804c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Tue, 19 Oct 2021 14:26:45 +0200 Subject: [PATCH] Add support for xmake 2.5.9 (and unity build for unit tests) --- tests/xmake.lua | 8 ++++++++ xmake.lua | 6 +++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/tests/xmake.lua b/tests/xmake.lua index 5ee51bb78..52b887b63 100644 --- a/tests/xmake.lua +++ b/tests/xmake.lua @@ -9,6 +9,10 @@ target("NazaraClientUnitTests") set_group("Tests") set_kind("binary") + if xmake.version():ge("2.5.9") then + add_rules("c++.unity_build") + end + add_deps("NazaraAudio", "NazaraCore", "NazaraNetwork", "NazaraPhysics2D", "NazaraShader") add_packages("catch2") @@ -20,6 +24,10 @@ target("NazaraUnitTests") set_group("Tests") set_kind("binary") + if xmake.version():ge("2.5.9") then + add_rules("c++.unity_build") + end + add_deps("NazaraCore", "NazaraNetwork", "NazaraPhysics2D", "NazaraShader") add_packages("catch2") diff --git a/xmake.lua b/xmake.lua index 09176064c..f2fa79908 100644 --- a/xmake.lua +++ b/xmake.lua @@ -241,7 +241,11 @@ rule("build_rendererplugins") rule("embed_resources") before_build(function (target, opt) import("core.base.option") - import("private.utils.progress") + if xmake.version():ge("2.5.9") then + import("utils.progress") + else + import("private.utils.progress") + end local function GenerateEmbedHeader(filepath, targetpath) local bufferSize = 1024 * 1024