1
0
Fork 0
mirror of https://github.com/gwm17/Specter.git synced 2024-11-22 18:28:52 -05:00

Restructured the repo so that things make more sense

This commit is contained in:
Gordon McCann 2021-12-18 20:00:32 -05:00
parent 64dd923c2a
commit 2502e2a620
21 changed files with 24 additions and 20 deletions

3
.gitignore vendored
View File

@ -5,6 +5,9 @@
Makefile
*.make
Navigator/Makefile
NavProject/Makefile
bin-int/
bin/
lib/

12
.gitmodules vendored
View File

@ -1,9 +1,9 @@
[submodule "src/vendor/spdlog"]
path = src/vendor/spdlog
[submodule "Navigator/vendor/spdlog"]
path = Navigator/vendor/spdlog
url = https://github.com/gabime/spdlog.git
[submodule "src/vendor/imgui"]
path = src/vendor/imgui
[submodule "Navigator/vendor/imgui"]
path = Navigator/vendor/imgui
url = https://github.com/gwm17/imgui.git
[submodule "src/vendor/glfw"]
path = src/vendor/glfw
[submodule "Navigator/vendor/glfw"]
path = Navigator/vendor/glfw
url = https://github.com/gwm17/glfw.git

View File

@ -11,12 +11,13 @@ workspace "Nova"
outputdir = "%{cfg.buildcfg}-%{cfg.system}-%{cfg.architecture}"
-- External directories to be included
IncludeDirs ={}
IncludeDirs["glfw"] = "src/vendor/glfw/include"
IncludeDirs["ImGui"] = "src/vendor/imgui"
IncludeDirs["glfw"] = "Navigator/vendor/glfw/include"
IncludeDirs["ImGui"] = "Navigator/vendor/imgui"
include "src/vendor/glfw"
include "src/vendor/imgui"
include "Navigator/vendor/glfw"
include "Navigator/vendor/imgui"
project "Navigator"
location "Navigator"
kind "StaticLib"
language "C++"
cppdialect "C++17"
@ -24,11 +25,11 @@ project "Navigator"
targetdir ("lib/" .. outputdir .. "/%{prj.name}")
objdir ("bin-int/" .. outputdir .. "/%{prj.name}")
pchheader "navpch.h"
pchsource "navpch.cpp"
pchsource "src/navpch.cpp"
files {
"src/%{prj.name}/**.h",
"src/%{prj.name}/**.cpp"
"%{prj.name}/src/**.h",
"%{prj.name}/src/**.cpp"
}
defines {
@ -36,9 +37,8 @@ project "Navigator"
}
includedirs {
"src/",
"src/vendor/spdlog/include/",
"src/%{prj.name}/",
"%{prj.name}/src/",
"%{prj.name}/vendor/spdlog/include/",
"%{IncludeDirs.glfw}",
"%{IncludeDirs.ImGui}",
}
@ -66,6 +66,7 @@ project "Navigator"
optimize "on"
project "NavProject"
location "NavProject"
kind "ConsoleApp"
language "C++"
cppdialect "C++17"
@ -74,14 +75,14 @@ project "NavProject"
objdir ("bin-int/" .. outputdir .. "/%{prj.name}")
files {
"src/main.cpp"
"NavProject/main.cpp"
}
includedirs {
"src/Navigator",
"src/vendor/spdlog/include/",
"src/vendor"
"Navigator/src",
"Navigator/vendor/spdlog/include/",
"Navigator/vendor"
}
links {