diff --git a/SHADE.sln b/SHADE.sln index a337b7c4..5dde626d 100644 --- a/SHADE.sln +++ b/SHADE.sln @@ -1,26 +1,26 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SHADE_Application", "SHADE_Application\SHADE_Application.vcxproj", "{BDC70008-29DE-FE9D-7255-8ABFDEAACF25}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SHADE_Engine", "SHADE_Engine\SHADE_Engine.vcxproj", "{3F92E998-2BF5-783D-D47A-B1F3C0BC44C0}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|x64 = Debug|x64 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {BDC70008-29DE-FE9D-7255-8ABFDEAACF25}.Debug|x64.ActiveCfg = Debug|x64 - {BDC70008-29DE-FE9D-7255-8ABFDEAACF25}.Debug|x64.Build.0 = Debug|x64 - {BDC70008-29DE-FE9D-7255-8ABFDEAACF25}.Release|x64.ActiveCfg = Release|x64 - {BDC70008-29DE-FE9D-7255-8ABFDEAACF25}.Release|x64.Build.0 = Release|x64 - {3F92E998-2BF5-783D-D47A-B1F3C0BC44C0}.Debug|x64.ActiveCfg = Debug|x64 - {3F92E998-2BF5-783D-D47A-B1F3C0BC44C0}.Debug|x64.Build.0 = Debug|x64 - {3F92E998-2BF5-783D-D47A-B1F3C0BC44C0}.Release|x64.ActiveCfg = Release|x64 - {3F92E998-2BF5-783D-D47A-B1F3C0BC44C0}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SHADE_Application", "SHADE_Application\SHADE_Application.vcxproj", "{BDC70008-29DE-FE9D-7255-8ABFDEAACF25}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SHADE_Engine", "SHADE_Engine\SHADE_Engine.vcxproj", "{3F92E998-2BF5-783D-D47A-B1F3C0BC44C0}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x64 = Debug|x64 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {BDC70008-29DE-FE9D-7255-8ABFDEAACF25}.Debug|x64.ActiveCfg = Debug|x64 + {BDC70008-29DE-FE9D-7255-8ABFDEAACF25}.Debug|x64.Build.0 = Debug|x64 + {BDC70008-29DE-FE9D-7255-8ABFDEAACF25}.Release|x64.ActiveCfg = Release|x64 + {BDC70008-29DE-FE9D-7255-8ABFDEAACF25}.Release|x64.Build.0 = Release|x64 + {3F92E998-2BF5-783D-D47A-B1F3C0BC44C0}.Debug|x64.ActiveCfg = Debug|x64 + {3F92E998-2BF5-783D-D47A-B1F3C0BC44C0}.Debug|x64.Build.0 = Debug|x64 + {3F92E998-2BF5-783D-D47A-B1F3C0BC44C0}.Release|x64.ActiveCfg = Release|x64 + {3F92E998-2BF5-783D-D47A-B1F3C0BC44C0}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/SHADE_Application/SHADE_Application.vcxproj b/SHADE_Application/SHADE_Application.vcxproj index e8f90dc7..ee49fafc 100644 --- a/SHADE_Application/SHADE_Application.vcxproj +++ b/SHADE_Application/SHADE_Application.vcxproj @@ -1,106 +1,115 @@ - - - - - Debug - x64 - - - Release - x64 - - - - {BDC70008-29DE-FE9D-7255-8ABFDEAACF25} - true - Win32Proj - SHADE_Application - 10.0 - - - - Application - true - Unicode - v142 - - - Application - false - Unicode - v142 - - - - - - - - - - - - - true - bin\Debug_x86_64\SHADE_Application\ - bin-int\Debug_x86_64\SHADE_Application\ - SHADE_Application - .exe - - - false - bin\Release_x86_64\SHADE_Application\ - bin-int\Release_x86_64\SHADE_Application\ - SHADE_Application - .exe - - - - Use - SBpch.h - Level4 - _DEBUG;%(PreprocessorDefinitions) - .;..\SHADE_Engine\src;src;%(AdditionalIncludeDirectories) - EditAndContinue - Disabled - false - MultiThreadedDebug - true - stdcpplatest - - - Console - true - - - - - Use - SBpch.h - Level4 - _RELEASE;%(PreprocessorDefinitions) - .;..\SHADE_Engine\src;src;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpplatest - - - Console - true - true - - - - - {3F92E998-2BF5-783D-D47A-B1F3C0BC44C0} - - - - - + + + + + Debug + x64 + + + Release + x64 + + + + {BDC70008-29DE-FE9D-7255-8ABFDEAACF25} + true + Win32Proj + SHADE_Application + 10.0 + + + + Application + true + Unicode + v142 + + + Application + false + Unicode + v142 + + + + + + + + + + + + + true + bin\Debug_x86_64\SHADE_Application\ + bin-int\Debug_x86_64\SHADE_Application\ + SHADE_Application + .exe + + + false + bin\Release_x86_64\SHADE_Application\ + bin-int\Release_x86_64\SHADE_Application\ + SHADE_Application + .exe + + + + Use + SBpch.h + Level4 + _DEBUG;%(PreprocessorDefinitions) + .;..\SHADE_Engine\src;src;%(AdditionalIncludeDirectories) + EditAndContinue + Disabled + false + MultiThreadedDebug + true + stdcpplatest + + + Console + true + + + + + Use + SBpch.h + Level4 + _RELEASE;%(PreprocessorDefinitions) + .;..\SHADE_Engine\src;src;%(AdditionalIncludeDirectories) + Full + true + true + false + true + MultiThreaded + true + stdcpplatest + + + Console + true + true + + + + + + + + Create + + + + + + {3F92E998-2BF5-783D-D47A-B1F3C0BC44C0} + + + + + \ No newline at end of file diff --git a/SHADE_Application/src/SBpch.cpp b/SHADE_Application/src/SBpch.cpp new file mode 100644 index 00000000..476ea499 --- /dev/null +++ b/SHADE_Application/src/SBpch.cpp @@ -0,0 +1 @@ +#include "SBpch.h" \ No newline at end of file diff --git a/SHADE_Application/src/SBpch.h b/SHADE_Application/src/SBpch.h new file mode 100644 index 00000000..3da84d7e --- /dev/null +++ b/SHADE_Application/src/SBpch.h @@ -0,0 +1 @@ +#include \ No newline at end of file diff --git a/SHADE_Application/src/WinMain.cpp b/SHADE_Application/src/WinMain.cpp new file mode 100644 index 00000000..21fb268a --- /dev/null +++ b/SHADE_Application/src/WinMain.cpp @@ -0,0 +1,7 @@ +#include "SBpch.h" + +INT WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, + PSTR lpCmdLine, INT nCmdShow) +{ + return 0; +} \ No newline at end of file diff --git a/SHADE_Engine/SHADE_Engine.vcxproj b/SHADE_Engine/SHADE_Engine.vcxproj index 600cb9b7..962281c2 100644 --- a/SHADE_Engine/SHADE_Engine.vcxproj +++ b/SHADE_Engine/SHADE_Engine.vcxproj @@ -1,107 +1,115 @@ - - - - - Debug - x64 - - - Release - x64 - - - - {3F92E998-2BF5-783D-D47A-B1F3C0BC44C0} - true - Win32Proj - SHADE_Engine - 10.0 - - - - StaticLibrary - true - Unicode - v142 - - - StaticLibrary - false - Unicode - v142 - - - - - - - - - - - - - bin\Debug_x86_64\SHADE_Engine\ - bin-int\Debug_x86_64\SHADE_Engine\ - SHADE_Engine - .lib - - - bin\Release_x86_64\SHADE_Engine\ - bin-int\Release_x86_64\SHADE_Engine\ - SHADE_Engine - .lib - - - - Use - SHpch.h - Level4 - _LIB;_GLFW_INCLUDE_NONE;MSDFGEN_USE_CPP11;_DEBUG;%(PreprocessorDefinitions) - src;..\Dependencies\assimp\include\assimp;..\Dependencies\imgui;..\Dependencies\imguizmo;..\Dependencies\imnodes;..\SHADE_Engine_y2\Dependencies\msdf\msdf-atlas-gen;..\SHADE_Engine_y2\Dependencies\msdf\msdfgen;..\SHADE_Engine_y2\Dependencies\spdlog\include\spdlog;..\SHADE_Engine_y2\Dependencies\stb;..\SHADE_Engine_y2\Dependencies\tracy;..\SHADE_Engine_y2\Dependencies\VMA\include;..\SHADE_Engine_y2\Dependencies\yamlcpp\include;%(AdditionalIncludeDirectories) - EditAndContinue - Disabled - false - MultiThreadedDebug - true - stdcpplatest - - - Windows - true - - - yamlcpp.lib;msdfgen.lib;msdf-atlas-gen.lib;fmodstudioL_vc.lib;fmodL_vc.lib;%(AdditionalDependencies) - libs;%(AdditionalLibraryDirectories) - - - - - Use - SHpch.h - Level4 - _LIB;_GLFW_INCLUDE_NONE;MSDFGEN_USE_CPP11;_RELEASE;%(PreprocessorDefinitions) - src;..\Dependencies\assimp\include\assimp;..\Dependencies\imgui;..\Dependencies\imguizmo;..\Dependencies\imnodes;..\SHADE_Engine_y2\Dependencies\msdf\msdf-atlas-gen;..\SHADE_Engine_y2\Dependencies\msdf\msdfgen;..\SHADE_Engine_y2\Dependencies\spdlog\include\spdlog;..\SHADE_Engine_y2\Dependencies\stb;..\SHADE_Engine_y2\Dependencies\tracy;..\SHADE_Engine_y2\Dependencies\VMA\include;..\SHADE_Engine_y2\Dependencies\yamlcpp\include;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpplatest - - - Windows - true - true - - - yamlcpp.lib;msdfgen.lib;msdf-atlas-gen.lib;fmodstudio_vc.lib;fmod_vc.lib;%(AdditionalDependencies) - libs;%(AdditionalLibraryDirectories) - - - - - + + + + + Debug + x64 + + + Release + x64 + + + + {3F92E998-2BF5-783D-D47A-B1F3C0BC44C0} + true + Win32Proj + SHADE_Engine + 10.0 + + + + StaticLibrary + true + Unicode + v142 + + + StaticLibrary + false + Unicode + v142 + + + + + + + + + + + + + bin\Debug_x86_64\SHADE_Engine\ + bin-int\Debug_x86_64\SHADE_Engine\ + SHADE_Engine + .lib + + + bin\Release_x86_64\SHADE_Engine\ + bin-int\Release_x86_64\SHADE_Engine\ + SHADE_Engine + .lib + + + + Use + SHpch.h + Level4 + _LIB;_GLFW_INCLUDE_NONE;MSDFGEN_USE_CPP11;_DEBUG;%(PreprocessorDefinitions) + src;..\Dependencies\assimp\include\assimp;..\Dependencies\imgui;..\Dependencies\imguizmo;..\Dependencies\imnodes;..\SHADE_Engine_y2\Dependencies\msdf\msdf-atlas-gen;..\SHADE_Engine_y2\Dependencies\msdf\msdfgen;..\SHADE_Engine_y2\Dependencies\spdlog\include\spdlog;..\SHADE_Engine_y2\Dependencies\stb;..\SHADE_Engine_y2\Dependencies\tracy;..\SHADE_Engine_y2\Dependencies\VMA\include;..\SHADE_Engine_y2\Dependencies\yamlcpp\include;%(AdditionalIncludeDirectories) + EditAndContinue + Disabled + false + MultiThreadedDebug + true + stdcpplatest + + + Windows + true + + + yamlcpp.lib;msdfgen.lib;msdf-atlas-gen.lib;fmodstudioL_vc.lib;fmodL_vc.lib;%(AdditionalDependencies) + libs;%(AdditionalLibraryDirectories) + + + + + Use + SHpch.h + Level4 + _LIB;_GLFW_INCLUDE_NONE;MSDFGEN_USE_CPP11;_RELEASE;%(PreprocessorDefinitions) + src;..\Dependencies\assimp\include\assimp;..\Dependencies\imgui;..\Dependencies\imguizmo;..\Dependencies\imnodes;..\SHADE_Engine_y2\Dependencies\msdf\msdf-atlas-gen;..\SHADE_Engine_y2\Dependencies\msdf\msdfgen;..\SHADE_Engine_y2\Dependencies\spdlog\include\spdlog;..\SHADE_Engine_y2\Dependencies\stb;..\SHADE_Engine_y2\Dependencies\tracy;..\SHADE_Engine_y2\Dependencies\VMA\include;..\SHADE_Engine_y2\Dependencies\yamlcpp\include;%(AdditionalIncludeDirectories) + Full + true + true + false + true + MultiThreaded + true + stdcpplatest + + + Windows + true + true + + + yamlcpp.lib;msdfgen.lib;msdf-atlas-gen.lib;fmodstudio_vc.lib;fmod_vc.lib;%(AdditionalDependencies) + libs;%(AdditionalLibraryDirectories) + + + + + + + + Create + + + + + \ No newline at end of file diff --git a/SHADE_Engine/src/SHpch.cpp b/SHADE_Engine/src/SHpch.cpp new file mode 100644 index 00000000..a7fec85b --- /dev/null +++ b/SHADE_Engine/src/SHpch.cpp @@ -0,0 +1 @@ +#include "SHpch.h" \ No newline at end of file diff --git a/SHADE_Engine/src/SHpch.h b/SHADE_Engine/src/SHpch.h new file mode 100644 index 00000000..e69de29b