From 2502e2a620703317c907465f1ab67716bc87fade Mon Sep 17 00:00:00 2001 From: Gordon McCann Date: Sat, 18 Dec 2021 20:00:32 -0500 Subject: [PATCH] Restructured the repo so that things make more sense --- .gitignore | 3 ++ .gitmodules | 12 ++++---- {src => NavProject}/main.cpp | 0 {src => Navigator/src}/Navigator.h | 0 .../src}/Navigator/Application.cpp | 0 .../src}/Navigator/Application.h | 0 .../src}/Navigator/CompassFile.cpp | 0 .../src}/Navigator/CompassFile.h | 0 {src => Navigator/src}/Navigator/CompassHit.h | 0 .../src}/Navigator/CompassRun.cpp | 0 {src => Navigator/src}/Navigator/CompassRun.h | 0 {src => Navigator/src}/Navigator/Logger.cpp | 0 {src => Navigator/src}/Navigator/Logger.h | 0 {src => Navigator/src}/Navigator/ShiftMap.cpp | 0 {src => Navigator/src}/Navigator/ShiftMap.h | 0 {src => Navigator/src}/navpch.cpp | 0 {src => Navigator/src}/navpch.h | 0 {src => Navigator}/vendor/glfw | 0 {src => Navigator}/vendor/imgui | 0 {src => Navigator}/vendor/spdlog | 0 premake5.lua | 29 ++++++++++--------- 21 files changed, 24 insertions(+), 20 deletions(-) rename {src => NavProject}/main.cpp (100%) rename {src => Navigator/src}/Navigator.h (100%) rename {src => Navigator/src}/Navigator/Application.cpp (100%) rename {src => Navigator/src}/Navigator/Application.h (100%) rename {src => Navigator/src}/Navigator/CompassFile.cpp (100%) rename {src => Navigator/src}/Navigator/CompassFile.h (100%) rename {src => Navigator/src}/Navigator/CompassHit.h (100%) rename {src => Navigator/src}/Navigator/CompassRun.cpp (100%) rename {src => Navigator/src}/Navigator/CompassRun.h (100%) rename {src => Navigator/src}/Navigator/Logger.cpp (100%) rename {src => Navigator/src}/Navigator/Logger.h (100%) rename {src => Navigator/src}/Navigator/ShiftMap.cpp (100%) rename {src => Navigator/src}/Navigator/ShiftMap.h (100%) rename {src => Navigator/src}/navpch.cpp (100%) rename {src => Navigator/src}/navpch.h (100%) rename {src => Navigator}/vendor/glfw (100%) rename {src => Navigator}/vendor/imgui (100%) rename {src => Navigator}/vendor/spdlog (100%) diff --git a/.gitignore b/.gitignore index d45ddbc..3f41672 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,9 @@ Makefile *.make +Navigator/Makefile +NavProject/Makefile + bin-int/ bin/ lib/ diff --git a/.gitmodules b/.gitmodules index bccb5c1..4673f76 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 diff --git a/src/main.cpp b/NavProject/main.cpp similarity index 100% rename from src/main.cpp rename to NavProject/main.cpp diff --git a/src/Navigator.h b/Navigator/src/Navigator.h similarity index 100% rename from src/Navigator.h rename to Navigator/src/Navigator.h diff --git a/src/Navigator/Application.cpp b/Navigator/src/Navigator/Application.cpp similarity index 100% rename from src/Navigator/Application.cpp rename to Navigator/src/Navigator/Application.cpp diff --git a/src/Navigator/Application.h b/Navigator/src/Navigator/Application.h similarity index 100% rename from src/Navigator/Application.h rename to Navigator/src/Navigator/Application.h diff --git a/src/Navigator/CompassFile.cpp b/Navigator/src/Navigator/CompassFile.cpp similarity index 100% rename from src/Navigator/CompassFile.cpp rename to Navigator/src/Navigator/CompassFile.cpp diff --git a/src/Navigator/CompassFile.h b/Navigator/src/Navigator/CompassFile.h similarity index 100% rename from src/Navigator/CompassFile.h rename to Navigator/src/Navigator/CompassFile.h diff --git a/src/Navigator/CompassHit.h b/Navigator/src/Navigator/CompassHit.h similarity index 100% rename from src/Navigator/CompassHit.h rename to Navigator/src/Navigator/CompassHit.h diff --git a/src/Navigator/CompassRun.cpp b/Navigator/src/Navigator/CompassRun.cpp similarity index 100% rename from src/Navigator/CompassRun.cpp rename to Navigator/src/Navigator/CompassRun.cpp diff --git a/src/Navigator/CompassRun.h b/Navigator/src/Navigator/CompassRun.h similarity index 100% rename from src/Navigator/CompassRun.h rename to Navigator/src/Navigator/CompassRun.h diff --git a/src/Navigator/Logger.cpp b/Navigator/src/Navigator/Logger.cpp similarity index 100% rename from src/Navigator/Logger.cpp rename to Navigator/src/Navigator/Logger.cpp diff --git a/src/Navigator/Logger.h b/Navigator/src/Navigator/Logger.h similarity index 100% rename from src/Navigator/Logger.h rename to Navigator/src/Navigator/Logger.h diff --git a/src/Navigator/ShiftMap.cpp b/Navigator/src/Navigator/ShiftMap.cpp similarity index 100% rename from src/Navigator/ShiftMap.cpp rename to Navigator/src/Navigator/ShiftMap.cpp diff --git a/src/Navigator/ShiftMap.h b/Navigator/src/Navigator/ShiftMap.h similarity index 100% rename from src/Navigator/ShiftMap.h rename to Navigator/src/Navigator/ShiftMap.h diff --git a/src/navpch.cpp b/Navigator/src/navpch.cpp similarity index 100% rename from src/navpch.cpp rename to Navigator/src/navpch.cpp diff --git a/src/navpch.h b/Navigator/src/navpch.h similarity index 100% rename from src/navpch.h rename to Navigator/src/navpch.h diff --git a/src/vendor/glfw b/Navigator/vendor/glfw similarity index 100% rename from src/vendor/glfw rename to Navigator/vendor/glfw diff --git a/src/vendor/imgui b/Navigator/vendor/imgui similarity index 100% rename from src/vendor/imgui rename to Navigator/vendor/imgui diff --git a/src/vendor/spdlog b/Navigator/vendor/spdlog similarity index 100% rename from src/vendor/spdlog rename to Navigator/vendor/spdlog diff --git a/premake5.lua b/premake5.lua index 60bb0e7..2ce0eb7 100644 --- a/premake5.lua +++ b/premake5.lua @@ -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 {