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

XMake: Use remove_files/remove_headerfiles

This commit is contained in:
Jérôme Leclercq 2021-12-24 11:06:44 +01:00
parent 1aa56b4db8
commit 3e708cf5ed
2 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/xmake.lua
View File

@ -26,5 +26,5 @@ target("NazaraClientUnitTests")
target("NazaraUnitTests") target("NazaraUnitTests")
add_files("main.cpp") add_files("main.cpp")
-- del_headerfiles("Engine/Audio/**") remove_headerfiles("Engine/Audio/**")
del_files("Engine/Audio/**") remove_files("Engine/Audio/**")

35
xmake.lua
View File

@ -30,8 +30,8 @@ local modules = {
end end
if is_plat("linux") then if is_plat("linux") then
del_files("src/Nazara/Network/Posix/SocketPollerImpl.hpp") remove_files("src/Nazara/Network/Posix/SocketPollerImpl.hpp")
del_files("src/Nazara/Network/Posix/SocketPollerImpl.cpp") remove_files("src/Nazara/Network/Posix/SocketPollerImpl.cpp")
end end
end end
}, },
@ -41,12 +41,12 @@ local modules = {
if is_plat("windows", "mingw") then if is_plat("windows", "mingw") then
add_syslinks("gdi32", "user32") add_syslinks("gdi32", "user32")
else else
del_files("src/Nazara/OpenGLRenderer/Wrapper/Win32/**.cpp") remove_files("src/Nazara/OpenGLRenderer/Wrapper/Win32/**.cpp")
del_files("src/Nazara/OpenGLRenderer/Wrapper/WGL/**.cpp") remove_files("src/Nazara/OpenGLRenderer/Wrapper/WGL/**.cpp")
end end
if not is_plat("linux") then if not is_plat("linux") then
del_files("src/Nazara/OpenGLRenderer/Wrapper/Linux/**.cpp") remove_files("src/Nazara/OpenGLRenderer/Wrapper/Linux/**.cpp")
end end
end end
}, },
@ -103,6 +103,10 @@ local modules = {
} }
} }
-- remove_headerfiles and remove_files were added in xmake 2.6.3, add a fallback for previous versions
remove_files = remove_files or del_files
remove_headerfiles = remove_headerfiles or function () end
set_xmakever("2.5.6") set_xmakever("2.5.6")
add_repositories("local-repo xmake-repo") add_repositories("local-repo xmake-repo")
@ -187,7 +191,8 @@ for name, module in pairs(modules) do
add_defines("NAZARA_" .. name:upper() .. "_DEBUG") add_defines("NAZARA_" .. name:upper() .. "_DEBUG")
end end
for _, ext in ipairs({".h", ".hpp", ".inl", ".natvis"}) do local headerExts = {".h", ".hpp", ".inl", ".natvis"}
for _, ext in ipairs(headerExts) do
add_headerfiles("include/(Nazara/" .. name .. "/**" .. ext .. ")") add_headerfiles("include/(Nazara/" .. name .. "/**" .. ext .. ")")
add_headerfiles("src/Nazara/" .. name .. "/**" .. ext) add_headerfiles("src/Nazara/" .. name .. "/**" .. ext)
end end
@ -200,13 +205,25 @@ for name, module in pairs(modules) do
end end
if is_plat("windows", "mingw") then if is_plat("windows", "mingw") then
del_files("src/Nazara/" .. name .. "/Posix/**.cpp") for _, ext in ipairs(headerExts) do
remove_headerfiles("src/Nazara/" .. name .. "/Posix/**" .. ext)
end
remove_files("src/Nazara/" .. name .. "/Posix/**.cpp")
else else
del_files("src/Nazara/" .. name .. "/Win32/**.cpp") for _, ext in ipairs(headerExts) do
remove_headerfiles("src/Nazara/" .. name .. "/Posix/**" .. ext)
end
remove_files("src/Nazara/" .. name .. "/Win32/**.cpp")
end end
if not is_plat("linux") then if not is_plat("linux") then
del_files("src/Nazara/" .. name .. "/Linux/**.cpp") for _, ext in ipairs(headerExts) do
remove_headerfiles("src/Nazara/" .. name .. "/Linux/**" .. ext)
end
remove_files("src/Nazara/" .. name .. "/Linux/**.cpp")
end end
end end