diff --git a/.gitignore b/.gitignore
index 3f41672..b2a2edb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,10 +4,13 @@
*.sublime-workspace
Makefile
*.make
+*.user
+
Navigator/Makefile
NavProject/Makefile
+.vs/
bin-int/
bin/
lib/
diff --git a/GenerateProjects.bat b/GenerateProjects.bat
new file mode 100644
index 0000000..45e19d7
--- /dev/null
+++ b/GenerateProjects.bat
@@ -0,0 +1,2 @@
+call ..\Nova\vendor\bin\premake\premake5.exe vs2019
+PAUSE
\ No newline at end of file
diff --git a/NavProject/NavProject.vcxproj b/NavProject/NavProject.vcxproj
new file mode 100644
index 0000000..36756a5
--- /dev/null
+++ b/NavProject/NavProject.vcxproj
@@ -0,0 +1,104 @@
+
+
+
+
+ Debug
+ x64
+
+
+ Release
+ x64
+
+
+
+ {6197989A-4D4F-DAE7-B656-B343A22D75D8}
+ true
+ Win32Proj
+ NavProject
+ 10.0
+
+
+
+ Application
+ true
+ Unicode
+ v142
+
+
+ Application
+ false
+ Unicode
+ v142
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ ..\bin\Debug-windows-x86_64\NavProject\
+ ..\bin-int\Debug-windows-x86_64\NavProject\
+ NavProject
+ .exe
+
+
+ false
+ ..\bin\Release-windows-x86_64\NavProject\
+ ..\bin-int\Release-windows-x86_64\NavProject\
+ NavProject
+ .exe
+
+
+
+ NotUsing
+ Level3
+ NAV_DEBUG;%(PreprocessorDefinitions)
+ ..\Navigator\src;..\Navigator\vendor\spdlog\include;..\Navigator\vendor;%(AdditionalIncludeDirectories)
+ EditAndContinue
+ Disabled
+ MultiThreadedDebug
+ stdcpp17
+
+
+ Console
+ true
+
+
+
+
+ NotUsing
+ Level3
+ NAV_RELEASE;%(PreprocessorDefinitions)
+ ..\Navigator\src;..\Navigator\vendor\spdlog\include;..\Navigator\vendor;%(AdditionalIncludeDirectories)
+ Full
+ true
+ true
+ false
+ true
+ MultiThreaded
+ stdcpp17
+
+
+ Console
+ true
+ true
+
+
+
+
+
+
+
+ {1056BD6C-7CC0-71E3-C5FE-228931A84F38}
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Navigator.sln b/Navigator.sln
new file mode 100644
index 0000000..7359307
--- /dev/null
+++ b/Navigator.sln
@@ -0,0 +1,38 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NavProject", "NavProject\NavProject.vcxproj", "{6197989A-4D4F-DAE7-B656-B343A22D75D8}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GLFW", "Navigator\vendor\glfw\GLFW.vcxproj", "{154B857C-0182-860D-AA6E-6C109684020F}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImGui", "Navigator\vendor\imgui\ImGui.vcxproj", "{C0FF640D-2C14-8DBE-F595-301E616989EF}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Navigator", "Navigator\Navigator.vcxproj", "{1056BD6C-7CC0-71E3-C5FE-228931A84F38}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|x64 = Debug|x64
+ Release|x64 = Release|x64
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {6197989A-4D4F-DAE7-B656-B343A22D75D8}.Debug|x64.ActiveCfg = Debug|x64
+ {6197989A-4D4F-DAE7-B656-B343A22D75D8}.Debug|x64.Build.0 = Debug|x64
+ {6197989A-4D4F-DAE7-B656-B343A22D75D8}.Release|x64.ActiveCfg = Release|x64
+ {6197989A-4D4F-DAE7-B656-B343A22D75D8}.Release|x64.Build.0 = Release|x64
+ {154B857C-0182-860D-AA6E-6C109684020F}.Debug|x64.ActiveCfg = Debug|x64
+ {154B857C-0182-860D-AA6E-6C109684020F}.Debug|x64.Build.0 = Debug|x64
+ {154B857C-0182-860D-AA6E-6C109684020F}.Release|x64.ActiveCfg = Release|x64
+ {154B857C-0182-860D-AA6E-6C109684020F}.Release|x64.Build.0 = Release|x64
+ {C0FF640D-2C14-8DBE-F595-301E616989EF}.Debug|x64.ActiveCfg = Debug|x64
+ {C0FF640D-2C14-8DBE-F595-301E616989EF}.Debug|x64.Build.0 = Debug|x64
+ {C0FF640D-2C14-8DBE-F595-301E616989EF}.Release|x64.ActiveCfg = Release|x64
+ {C0FF640D-2C14-8DBE-F595-301E616989EF}.Release|x64.Build.0 = Release|x64
+ {1056BD6C-7CC0-71E3-C5FE-228931A84F38}.Debug|x64.ActiveCfg = Debug|x64
+ {1056BD6C-7CC0-71E3-C5FE-228931A84F38}.Debug|x64.Build.0 = Debug|x64
+ {1056BD6C-7CC0-71E3-C5FE-228931A84F38}.Release|x64.ActiveCfg = Release|x64
+ {1056BD6C-7CC0-71E3-C5FE-228931A84F38}.Release|x64.Build.0 = Release|x64
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
diff --git a/Navigator/Navigator.vcxproj b/Navigator/Navigator.vcxproj
new file mode 100644
index 0000000..1a8dde8
--- /dev/null
+++ b/Navigator/Navigator.vcxproj
@@ -0,0 +1,132 @@
+
+
+
+
+ Debug
+ x64
+
+
+ Release
+ x64
+
+
+
+ {1056BD6C-7CC0-71E3-C5FE-228931A84F38}
+ true
+ Win32Proj
+ Navigator
+ 10.0
+
+
+
+ StaticLibrary
+ true
+ Unicode
+ v142
+
+
+ StaticLibrary
+ false
+ Unicode
+ v142
+
+
+
+
+
+
+
+
+
+
+
+
+ ..\lib\Debug-windows-x86_64\Navigator\
+ ..\bin-int\Debug-windows-x86_64\Navigator\
+ Navigator
+ .lib
+
+
+ ..\lib\Release-windows-x86_64\Navigator\
+ ..\bin-int\Release-windows-x86_64\Navigator\
+ Navigator
+ .lib
+
+
+
+ Use
+ navpch.h
+ Level3
+ NAV_WINDOWS;_CRT_SECURE_NO_WARNINGS;GLFW_INCLUDE_NONE;NAV_DEBUG;%(PreprocessorDefinitions)
+ src;vendor\spdlog\include;vendor\glfw\include;vendor\imgui;%(AdditionalIncludeDirectories)
+ navpch.h
+ EditAndContinue
+ Disabled
+ MultiThreadedDebug
+ stdcpp17
+
+
+ Windows
+ true
+
+
+ opengl32.lib;%(AdditionalDependencies)
+
+
+
+
+ Use
+ navpch.h
+ Level3
+ NAV_WINDOWS;_CRT_SECURE_NO_WARNINGS;GLFW_INCLUDE_NONE;NAV_RELEASE;%(PreprocessorDefinitions)
+ src;vendor\spdlog\include;vendor\glfw\include;vendor\imgui;%(AdditionalIncludeDirectories)
+ navpch.h
+ Full
+ true
+ true
+ false
+ true
+ MultiThreaded
+ stdcpp17
+
+
+ Windows
+ true
+ true
+
+
+ opengl32.lib;%(AdditionalDependencies)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Create
+
+
+
+
+ {154B857C-0182-860D-AA6E-6C109684020F}
+
+
+ {C0FF640D-2C14-8DBE-F595-301E616989EF}
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Navigator/Navigator.vcxproj.filters b/Navigator/Navigator.vcxproj.filters
new file mode 100644
index 0000000..c374c83
--- /dev/null
+++ b/Navigator/Navigator.vcxproj.filters
@@ -0,0 +1,48 @@
+
+
+
+
+ {1056BD6C-7CC0-71E3-C5FE-228931A84F38}
+
+
+
+
+
+ Navigator
+
+
+ Navigator
+
+
+ Navigator
+
+
+ Navigator
+
+
+ Navigator
+
+
+ Navigator
+
+
+
+
+
+ Navigator
+
+
+ Navigator
+
+
+ Navigator
+
+
+ Navigator
+
+
+ Navigator
+
+
+
+
\ No newline at end of file
diff --git a/Navigator/src/Navigator/Application.cpp b/Navigator/src/Navigator/Application.cpp
index 30b420a..f170f71 100644
--- a/Navigator/src/Navigator/Application.cpp
+++ b/Navigator/src/Navigator/Application.cpp
@@ -1,4 +1,3 @@
-#include
#include "Application.h"
namespace Navigator {
diff --git a/Navigator/src/Navigator/CompassFile.cpp b/Navigator/src/Navigator/CompassFile.cpp
index cbb2c0c..7a2f707 100644
--- a/Navigator/src/Navigator/CompassFile.cpp
+++ b/Navigator/src/Navigator/CompassFile.cpp
@@ -8,7 +8,6 @@
Written by G.W. McCann Oct. 2020
*/
-#include
#include "CompassFile.h"
namespace Navigator {
diff --git a/Navigator/src/Navigator/CompassRun.cpp b/Navigator/src/Navigator/CompassRun.cpp
index 07bba4a..8e51a7f 100644
--- a/Navigator/src/Navigator/CompassRun.cpp
+++ b/Navigator/src/Navigator/CompassRun.cpp
@@ -9,7 +9,6 @@
Updated to also handle scaler data. -- GWM Oct. 2020
*/
-#include
#include "CompassRun.h"
namespace Navigator {
diff --git a/Navigator/src/Navigator/Logger.cpp b/Navigator/src/Navigator/Logger.cpp
index ea92d2f..32dfa15 100644
--- a/Navigator/src/Navigator/Logger.cpp
+++ b/Navigator/src/Navigator/Logger.cpp
@@ -1,4 +1,3 @@
-#include
#include "Logger.h"
#include "spdlog/sinks/stdout_color_sinks.h"
diff --git a/Navigator/src/Navigator/ShiftMap.cpp b/Navigator/src/Navigator/ShiftMap.cpp
index f7aca80..5f1017b 100644
--- a/Navigator/src/Navigator/ShiftMap.cpp
+++ b/Navigator/src/Navigator/ShiftMap.cpp
@@ -9,7 +9,6 @@
Written by G.W. McCann Oct. 2020
*/
-#include
#include "ShiftMap.h"
namespace Navigator {
diff --git a/premake5.lua b/premake5.lua
index 2ce0eb7..450823c 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -1,4 +1,4 @@
-workspace "Nova"
+workspace "Navigator"
architecture "x64"
configurations {
"Debug",
@@ -25,7 +25,26 @@ project "Navigator"
targetdir ("lib/" .. outputdir .. "/%{prj.name}")
objdir ("bin-int/" .. outputdir .. "/%{prj.name}")
pchheader "navpch.h"
- pchsource "src/navpch.cpp"
+ pchsource "Navigator/src/navpch.cpp"
+
+ filter "system:windows"
+ defines "NAV_WINDOWS"
+ forceincludes {"navpch.h"}
+ includedirs {
+ "%{prj.name}/src/",
+ "%{prj.name}/vendor/spdlog/include/",
+ "%{IncludeDirs.glfw}",
+ "%{IncludeDirs.ImGui}",
+ }
+ filter "system:linux or macosx"
+ defines "NAV_UNIX"
+ defines "NAV_PCH"
+ includedirs {
+ "%{prj.name}/vendor/spdlog/include/",
+ "%{IncludeDirs.glfw}",
+ "%{IncludeDirs.ImGui}",
+ }
+ filter {}
files {
"%{prj.name}/src/**.h",
@@ -36,13 +55,6 @@ project "Navigator"
"_CRT_SECURE_NO_WARNINGS"
}
- includedirs {
- "%{prj.name}/src/",
- "%{prj.name}/vendor/spdlog/include/",
- "%{IncludeDirs.glfw}",
- "%{IncludeDirs.ImGui}",
- }
-
links {
"GLFW",
"ImGui",