xmake: relative paths

This commit is contained in:
2024-03-07 21:03:23 +01:00
parent d96b01074e
commit 88cb433ecf
5 changed files with 10 additions and 10 deletions

View File

@@ -1,6 +1,6 @@
add_rules("mode.debug", "mode.release", "mode.valgrind")
add_includedirs("$(projectdir)/include")
add_includedirs("include")
set_languages("c++17")
includes("xmake/BlitzClient.lua")

View File

@@ -9,6 +9,6 @@ target("Blitz")
set_kind("shared")
end
add_files("$(projectdir)/src/blitz/**.cpp", "$(projectdir)/src/server/**.cpp")
add_files("../src/blitz/**.cpp", "../src/server/**.cpp")
add_packages("zlib")

View File

@@ -13,14 +13,14 @@ target("BlitzClient")
set_default(true)
add_files("$(projectdir)/src/client/**.cpp", "$(projectdir)/src/ClientMain.cpp")
add_files("../src/client/**.cpp", "../src/ClientMain.cpp")
-- Libraries
add_deps("Blitz")
add_packages("libsdl", "glbinding", "assimp", "nlohmann_json")
add_includedirs("$(projectdir)/libs", "$(projectdir)/libs/imgui")
add_files("$(projectdir)/libs/imgui/**.cpp")
add_includedirs("../libs", "../libs/imgui")
add_files("../libs/imgui/**.cpp")
if is_plat("macosx") then
add_frameworks("OpenGL")
@@ -29,12 +29,12 @@ target("BlitzClient")
end
-- Assets
set_rundir("$(projectdir)/assets")
set_rundir("../assets")
-- Valgrind test
if is_mode("valgrind") then
on_run(function (target)
os.cd("$(projectdir)/assets")
os.cd("../assets")
os.execv("valgrind", {"-s", "--leak-check=full", target:targetfile()})
end)
end

View File

@@ -5,7 +5,7 @@ target("BlitzServer")
set_kind("binary")
set_default(false)
add_files("$(projectdir)/src/ServerMain.cpp")
add_files("../src/ServerMain.cpp")
-- Libraries
add_deps("Blitz")

View File

@@ -4,11 +4,11 @@ includes("Blitz.lua")
set_xmakever("2.8.5")
-- Tests
for _, file in ipairs(os.files("test/test_*.cpp")) do
for _, file in ipairs(os.files("../test/test_*.cpp")) do
local name = path.basename(file)
target(name)
set_kind("binary")
add_files("test/" .. name .. ".cpp")
add_files("../test/" .. name .. ".cpp")
set_default(false)