further moving towards new build system

This commit is contained in:
Sara 2023-11-20 14:10:48 +01:00
parent c6d4351c48
commit c10c4ad629
4 changed files with 26 additions and 13 deletions

10
.gitignore vendored
View file

@ -1,8 +1,6 @@
.cache/clangd/index .cache/clangd/index
bin bin/
maps/fencer.tiled-session build/
fencer intermediate/
build/obj/Debug
build/Makefile
Makefile
compile_commands.json compile_commands.json
Makefile

View file

@ -1,4 +1,4 @@
-- workspace "Fencer-Template" -- replace this workspace "Fencer-Template"
architecture "x64" architecture "x64"
configurations { "Debug", "Release", "Dist" } configurations { "Debug", "Release", "Dist" }
startproject "Game" startproject "Game"
@ -8,8 +8,17 @@
OutputDir = "%{cfg.system}-%{cfg.architecture}/${cfg.buildcfg}" OutputDir = "%{cfg.system}-%{cfg.architecture}/${cfg.buildcfg}"
group "Core" group "Core"
include "core/Build-Core.lua" include "core/Build-Core.lua"
group "" group ""
libdirs {
os.findlib("SDL2"),
os.findlib("SDL2_image"),
os.findlib("SDL2_ttf"),
os.findlib("m"),
os.findlib("cJSON")
}
include "game/Build-Game.lua" include "game/Build-Game.lua"

View file

@ -1,14 +1,16 @@
project "Fencer-Core" project "Engine-Core"
kind "StaticLib" kind "StaticLib"
language "C" language "C"
targetdir "bin/%{cfg.buildcfg}" targetdir "bin/%{cfg.buildcfg}"
staticruntime "off" staticruntime "off"
defines { "VMATH_SDL" }
files { "src/**.c" } files { "src/**.c" }
includedirs { "src/" } includedirs { "src/" }
targetdir ( "../bin" .. OutputDir .. "/%{prj.name}" ) targetdir ( "../bin/" .. OutputDir .. "/%{prj.name}" )
objdir ( "../intermediate" .. OutputDir .. "/%{prj.name}" ) objdir ( "../intermediate/" .. OutputDir .. "/%{prj.name}" )
filter "system:windows" filter "system:windows"
systemversion "latest" systemversion "latest"

View file

@ -4,17 +4,21 @@ project "Game"
staticruntime "Off" staticruntime "Off"
targetdir "bin/%{cfg.buildcfg}" targetdir "bin/%{cfg.buildcfg}"
defines { "VMATH_SDL" }
files { "src/*.c" } files { "src/*.c" }
includedirs { includedirs {
"src/", "src/",
"../core/src" "../core/src"
} }
links { links {
"Fencer-Core" "Engine-Core"
} }
targetdir ("../bin" .. OutputDir .. "/%{prj.name}" ) links { "SDL2", "SDL2_image", "SDL2_ttf", "m", "cjson"}
objdir ("../intermediate" .. OutputDir .. "/%{prj.name}" )
targetdir ("../bin/" .. OutputDir .. "/%{prj.name}" )
objdir ("../intermediate/" .. OutputDir .. "/%{prj.name}" )
filter "configurations:Debug" filter "configurations:Debug"
defines { "DEBUG" } defines { "DEBUG" }