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:
parent
64dd923c2a
commit
2502e2a620
3
.gitignore
vendored
3
.gitignore
vendored
|
@ -5,6 +5,9 @@
|
||||||
Makefile
|
Makefile
|
||||||
*.make
|
*.make
|
||||||
|
|
||||||
|
Navigator/Makefile
|
||||||
|
NavProject/Makefile
|
||||||
|
|
||||||
bin-int/
|
bin-int/
|
||||||
bin/
|
bin/
|
||||||
lib/
|
lib/
|
||||||
|
|
12
.gitmodules
vendored
12
.gitmodules
vendored
|
@ -1,9 +1,9 @@
|
||||||
[submodule "src/vendor/spdlog"]
|
[submodule "Navigator/vendor/spdlog"]
|
||||||
path = src/vendor/spdlog
|
path = Navigator/vendor/spdlog
|
||||||
url = https://github.com/gabime/spdlog.git
|
url = https://github.com/gabime/spdlog.git
|
||||||
[submodule "src/vendor/imgui"]
|
[submodule "Navigator/vendor/imgui"]
|
||||||
path = src/vendor/imgui
|
path = Navigator/vendor/imgui
|
||||||
url = https://github.com/gwm17/imgui.git
|
url = https://github.com/gwm17/imgui.git
|
||||||
[submodule "src/vendor/glfw"]
|
[submodule "Navigator/vendor/glfw"]
|
||||||
path = src/vendor/glfw
|
path = Navigator/vendor/glfw
|
||||||
url = https://github.com/gwm17/glfw.git
|
url = https://github.com/gwm17/glfw.git
|
||||||
|
|
0
src/vendor/glfw → Navigator/vendor/glfw
vendored
0
src/vendor/glfw → Navigator/vendor/glfw
vendored
29
premake5.lua
29
premake5.lua
|
@ -11,12 +11,13 @@ workspace "Nova"
|
||||||
outputdir = "%{cfg.buildcfg}-%{cfg.system}-%{cfg.architecture}"
|
outputdir = "%{cfg.buildcfg}-%{cfg.system}-%{cfg.architecture}"
|
||||||
-- External directories to be included
|
-- External directories to be included
|
||||||
IncludeDirs ={}
|
IncludeDirs ={}
|
||||||
IncludeDirs["glfw"] = "src/vendor/glfw/include"
|
IncludeDirs["glfw"] = "Navigator/vendor/glfw/include"
|
||||||
IncludeDirs["ImGui"] = "src/vendor/imgui"
|
IncludeDirs["ImGui"] = "Navigator/vendor/imgui"
|
||||||
|
|
||||||
include "src/vendor/glfw"
|
include "Navigator/vendor/glfw"
|
||||||
include "src/vendor/imgui"
|
include "Navigator/vendor/imgui"
|
||||||
project "Navigator"
|
project "Navigator"
|
||||||
|
location "Navigator"
|
||||||
kind "StaticLib"
|
kind "StaticLib"
|
||||||
language "C++"
|
language "C++"
|
||||||
cppdialect "C++17"
|
cppdialect "C++17"
|
||||||
|
@ -24,11 +25,11 @@ project "Navigator"
|
||||||
targetdir ("lib/" .. outputdir .. "/%{prj.name}")
|
targetdir ("lib/" .. outputdir .. "/%{prj.name}")
|
||||||
objdir ("bin-int/" .. outputdir .. "/%{prj.name}")
|
objdir ("bin-int/" .. outputdir .. "/%{prj.name}")
|
||||||
pchheader "navpch.h"
|
pchheader "navpch.h"
|
||||||
pchsource "navpch.cpp"
|
pchsource "src/navpch.cpp"
|
||||||
|
|
||||||
files {
|
files {
|
||||||
"src/%{prj.name}/**.h",
|
"%{prj.name}/src/**.h",
|
||||||
"src/%{prj.name}/**.cpp"
|
"%{prj.name}/src/**.cpp"
|
||||||
}
|
}
|
||||||
|
|
||||||
defines {
|
defines {
|
||||||
|
@ -36,9 +37,8 @@ project "Navigator"
|
||||||
}
|
}
|
||||||
|
|
||||||
includedirs {
|
includedirs {
|
||||||
"src/",
|
"%{prj.name}/src/",
|
||||||
"src/vendor/spdlog/include/",
|
"%{prj.name}/vendor/spdlog/include/",
|
||||||
"src/%{prj.name}/",
|
|
||||||
"%{IncludeDirs.glfw}",
|
"%{IncludeDirs.glfw}",
|
||||||
"%{IncludeDirs.ImGui}",
|
"%{IncludeDirs.ImGui}",
|
||||||
}
|
}
|
||||||
|
@ -66,6 +66,7 @@ project "Navigator"
|
||||||
optimize "on"
|
optimize "on"
|
||||||
|
|
||||||
project "NavProject"
|
project "NavProject"
|
||||||
|
location "NavProject"
|
||||||
kind "ConsoleApp"
|
kind "ConsoleApp"
|
||||||
language "C++"
|
language "C++"
|
||||||
cppdialect "C++17"
|
cppdialect "C++17"
|
||||||
|
@ -74,14 +75,14 @@ project "NavProject"
|
||||||
objdir ("bin-int/" .. outputdir .. "/%{prj.name}")
|
objdir ("bin-int/" .. outputdir .. "/%{prj.name}")
|
||||||
|
|
||||||
files {
|
files {
|
||||||
"src/main.cpp"
|
"NavProject/main.cpp"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
includedirs {
|
includedirs {
|
||||||
"src/Navigator",
|
"Navigator/src",
|
||||||
"src/vendor/spdlog/include/",
|
"Navigator/vendor/spdlog/include/",
|
||||||
"src/vendor"
|
"Navigator/vendor"
|
||||||
}
|
}
|
||||||
|
|
||||||
links {
|
links {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user