diff --git a/SHADE.sln b/SHADE.sln index 5dde626d..94775b48 100644 --- a/SHADE.sln +++ b/SHADE.sln @@ -3,6 +3,16 @@ 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("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dependencies", "Dependencies", "{53E47842-3FC8-3998-A828-34EB942B241A}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "freetype", "Dependencies\msdf\msdfgen\freetype\freetype.vcxproj", "{89895BD8-7556-B6E3-9E6F-A48B8A9BEB71}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "msdf-atlas-gen", "Dependencies\msdf\msdf-atlas-gen.vcxproj", "{38BD587B-248B-4C81-0D1F-BDA7F98B28E6}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "msdfgen", "Dependencies\msdf\msdfgen\msdfgen.vcxproj", "{8900D8DD-F5DF-5679-FEF7-E14F6A56BDDA}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yamlcpp", "Dependencies\yamlcpp\yamlcpp.vcxproj", "{7B153C50-E7F4-BAEB-F00C-46C25C6B214D}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SHADE_Engine", "SHADE_Engine\SHADE_Engine.vcxproj", "{3F92E998-2BF5-783D-D47A-B1F3C0BC44C0}" EndProject Global @@ -15,6 +25,22 @@ Global {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 + {89895BD8-7556-B6E3-9E6F-A48B8A9BEB71}.Debug|x64.ActiveCfg = Debug|x64 + {89895BD8-7556-B6E3-9E6F-A48B8A9BEB71}.Debug|x64.Build.0 = Debug|x64 + {89895BD8-7556-B6E3-9E6F-A48B8A9BEB71}.Release|x64.ActiveCfg = Release|x64 + {89895BD8-7556-B6E3-9E6F-A48B8A9BEB71}.Release|x64.Build.0 = Release|x64 + {38BD587B-248B-4C81-0D1F-BDA7F98B28E6}.Debug|x64.ActiveCfg = Debug|x64 + {38BD587B-248B-4C81-0D1F-BDA7F98B28E6}.Debug|x64.Build.0 = Debug|x64 + {38BD587B-248B-4C81-0D1F-BDA7F98B28E6}.Release|x64.ActiveCfg = Release|x64 + {38BD587B-248B-4C81-0D1F-BDA7F98B28E6}.Release|x64.Build.0 = Release|x64 + {8900D8DD-F5DF-5679-FEF7-E14F6A56BDDA}.Debug|x64.ActiveCfg = Debug|x64 + {8900D8DD-F5DF-5679-FEF7-E14F6A56BDDA}.Debug|x64.Build.0 = Debug|x64 + {8900D8DD-F5DF-5679-FEF7-E14F6A56BDDA}.Release|x64.ActiveCfg = Release|x64 + {8900D8DD-F5DF-5679-FEF7-E14F6A56BDDA}.Release|x64.Build.0 = Release|x64 + {7B153C50-E7F4-BAEB-F00C-46C25C6B214D}.Debug|x64.ActiveCfg = Debug|x64 + {7B153C50-E7F4-BAEB-F00C-46C25C6B214D}.Debug|x64.Build.0 = Debug|x64 + {7B153C50-E7F4-BAEB-F00C-46C25C6B214D}.Release|x64.ActiveCfg = Release|x64 + {7B153C50-E7F4-BAEB-F00C-46C25C6B214D}.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 @@ -23,4 +49,10 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {89895BD8-7556-B6E3-9E6F-A48B8A9BEB71} = {53E47842-3FC8-3998-A828-34EB942B241A} + {38BD587B-248B-4C81-0D1F-BDA7F98B28E6} = {53E47842-3FC8-3998-A828-34EB942B241A} + {8900D8DD-F5DF-5679-FEF7-E14F6A56BDDA} = {53E47842-3FC8-3998-A828-34EB942B241A} + {7B153C50-E7F4-BAEB-F00C-46C25C6B214D} = {53E47842-3FC8-3998-A828-34EB942B241A} + EndGlobalSection EndGlobal diff --git a/SHADE_Engine/SHADE_Engine.vcxproj b/SHADE_Engine/SHADE_Engine.vcxproj index 962281c2..04be7ba3 100644 --- a/SHADE_Engine/SHADE_Engine.vcxproj +++ b/SHADE_Engine/SHADE_Engine.vcxproj @@ -71,7 +71,7 @@ true - yamlcpp.lib;msdfgen.lib;msdf-atlas-gen.lib;fmodstudioL_vc.lib;fmodL_vc.lib;%(AdditionalDependencies) + fmodstudioL_vc.lib;fmodL_vc.lib;%(AdditionalDependencies) libs;%(AdditionalLibraryDirectories) @@ -97,18 +97,31 @@ true - yamlcpp.lib;msdfgen.lib;msdf-atlas-gen.lib;fmodstudio_vc.lib;fmod_vc.lib;%(AdditionalDependencies) + fmodstudio_vc.lib;fmod_vc.lib;%(AdditionalDependencies) libs;%(AdditionalLibraryDirectories) + + Create + + + {7B153C50-E7F4-BAEB-F00C-46C25C6B214D} + + + {8900D8DD-F5DF-5679-FEF7-E14F6A56BDDA} + + + {38BD587B-248B-4C81-0D1F-BDA7F98B28E6} + + diff --git a/SHADE_Engine/SHADE_Engine.vcxproj.filters b/SHADE_Engine/SHADE_Engine.vcxproj.filters new file mode 100644 index 00000000..b16c713b --- /dev/null +++ b/SHADE_Engine/SHADE_Engine.vcxproj.filters @@ -0,0 +1,20 @@ + + + + + {DBC7D3B0-C769-FE86-B024-12DB9C6585D7} + + + + + Engine + + + + + + Engine + + + + \ No newline at end of file diff --git a/SHADE_Engine/src/Engine/SHEngine.cpp b/SHADE_Engine/src/Engine/SHEngine.cpp new file mode 100644 index 00000000..f65a5402 --- /dev/null +++ b/SHADE_Engine/src/Engine/SHEngine.cpp @@ -0,0 +1,2 @@ +#include "SHpch.h" +#include "SHEngine.h" \ No newline at end of file diff --git a/SHADE_Engine/src/Engine/SHEngine.h b/SHADE_Engine/src/Engine/SHEngine.h new file mode 100644 index 00000000..7d723425 --- /dev/null +++ b/SHADE_Engine/src/Engine/SHEngine.h @@ -0,0 +1,9 @@ +#pragma once + +namespace SHADE +{ + class SHEngine + { + + }; +} \ No newline at end of file diff --git a/premake5.lua b/premake5.lua index e11636d4..746a2854 100644 --- a/premake5.lua +++ b/premake5.lua @@ -18,4 +18,13 @@ workspace "SHADE" outputdir = "%{cfg.buildcfg}_%{cfg.architecture}" include "SHADE_Application" - include "SHADE_Engine" \ No newline at end of file + include "SHADE_Engine" + + group "Dependencies" + --include "Dependencies/imgui" + include "Dependencies/msdf" + --include "Dependencies/spdlog" + --include "Dependencies/tracy" + --include "Dependencies/VMA" + include "Dependencies/yamlcpp" + group ""