sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support for xmake 2.5.9 (and unity build for unit tests)

This commit is contained in:
Jérôme Leclercq 2021-10-19 14:26:45 +02:00
parent c3999d708f
commit 04ee6f0fd1
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/xmake.lua
View File

@ -9,6 +9,10 @@ target("NazaraClientUnitTests")
set_group("Tests") set_group("Tests")
set_kind("binary") 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_deps("NazaraAudio", "NazaraCore", "NazaraNetwork", "NazaraPhysics2D", "NazaraShader")
add_packages("catch2") add_packages("catch2")
@ -20,6 +24,10 @@ target("NazaraUnitTests")
set_group("Tests") set_group("Tests")
set_kind("binary") set_kind("binary")
if xmake.version():ge("2.5.9") then
add_rules("c++.unity_build")
end
add_deps("NazaraCore", "NazaraNetwork", "NazaraPhysics2D", "NazaraShader") add_deps("NazaraCore", "NazaraNetwork", "NazaraPhysics2D", "NazaraShader")
add_packages("catch2") add_packages("catch2")

6
xmake.lua
View File

@ -241,7 +241,11 @@ rule("build_rendererplugins")
rule("embed_resources") rule("embed_resources")
before_build(function (target, opt) before_build(function (target, opt)
import("core.base.option") 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 function GenerateEmbedHeader(filepath, targetpath)
local bufferSize = 1024 * 1024 local bufferSize = 1024 * 1024