diff --git a/Bootstrap.sln b/Bootstrap.sln index c28fac1c..7d0ccb96 100644 --- a/Bootstrap.sln +++ b/Bootstrap.sln @@ -1,19 +1,11 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25123.0 +# Visual Studio 15 +VisualStudioVersion = 15.0.28307.106 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Bootstrap", "bootstrap\Bootstrap.vcxproj", "{AF59BB0B-E059-4773-83DC-728A949647DA}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Project2D", "Project2D\Project2D.vcxproj", "{3F428D0C-1CC8-47C3-818A-A3C2972C74C9}" - ProjectSection(ProjectDependencies) = postProject - {AF59BB0B-E059-4773-83DC-728A949647DA} = {AF59BB0B-E059-4773-83DC-728A949647DA} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Project3D", "Project3D\Project3D.vcxproj", "{EA21C4DF-E331-4FCF-8513-14A3F56B77F3}" - ProjectSection(ProjectDependencies) = postProject - {AF59BB0B-E059-4773-83DC-728A949647DA} = {AF59BB0B-E059-4773-83DC-728A949647DA} - EndProjectSection +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Project2D", "project2D\Project2D.vcxproj", "{3F428D0C-1CC8-47C3-818A-A3C2972C74C9}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -39,16 +31,11 @@ Global {3F428D0C-1CC8-47C3-818A-A3C2972C74C9}.Release|x64.Build.0 = Release|x64 {3F428D0C-1CC8-47C3-818A-A3C2972C74C9}.Release|x86.ActiveCfg = Release|Win32 {3F428D0C-1CC8-47C3-818A-A3C2972C74C9}.Release|x86.Build.0 = Release|Win32 - {EA21C4DF-E331-4FCF-8513-14A3F56B77F3}.Debug|x64.ActiveCfg = Debug|x64 - {EA21C4DF-E331-4FCF-8513-14A3F56B77F3}.Debug|x64.Build.0 = Debug|x64 - {EA21C4DF-E331-4FCF-8513-14A3F56B77F3}.Debug|x86.ActiveCfg = Debug|Win32 - {EA21C4DF-E331-4FCF-8513-14A3F56B77F3}.Debug|x86.Build.0 = Debug|Win32 - {EA21C4DF-E331-4FCF-8513-14A3F56B77F3}.Release|x64.ActiveCfg = Release|x64 - {EA21C4DF-E331-4FCF-8513-14A3F56B77F3}.Release|x64.Build.0 = Release|x64 - {EA21C4DF-E331-4FCF-8513-14A3F56B77F3}.Release|x86.ActiveCfg = Release|Win32 - {EA21C4DF-E331-4FCF-8513-14A3F56B77F3}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {50492CB4-5216-4B96-80EB-B4986E8DF52A} + EndGlobalSection EndGlobal diff --git a/bootstrap/Bootstrap.vcxproj b/bootstrap/Bootstrap.vcxproj index af30ea0d..d7da4824 100644 --- a/bootstrap/Bootstrap.vcxproj +++ b/bootstrap/Bootstrap.vcxproj @@ -19,7 +19,7 @@ - {AF59BB0B-E059-4773-83DC-728A949647DA} + {5ECC2759-0EF7-4D46-8793-E5C7709B1EDA} Win32Proj Bootstrap 10.0.17763.0 @@ -70,28 +70,28 @@ - $(SolutionDir)dependencies/imgui;$(SolutionDir)dependencies/glfw/include;$(SolutionDir)dependencies/glm;$(SolutionDir)dependencies/stb;$(VC_IncludePath);$(WindowsSDK_IncludePath); - $(SolutionDir)dependencies\$(ProjectName)\$(Platform)\$(Configuration)\ + $(ProjectDir)..\dependencies/imgui;$(ProjectDir)..\dependencies/glfw/include;$(ProjectDir)..\dependencies/glm;$(ProjectDir)..\dependencies/stb;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(ProjectDir)..\dependencies/imgui;$(ProjectDir)..\dependencies/glfw/include;$(ProjectDir)..\dependencies/glm;$(ProjectDir)..\dependencies/stb;$(VC_IncludePath);$(WindowsSDK_IncludePath) + $(ProjectDir)build\$(Platform)\$(Configuration)\ $(SolutionDir)temp\$(ProjectName)\$(Platform)\$(Configuration)\ - $(SolutionDir)dependencies/glfw/lib-vc2015;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86 + $(ProjectDir)..\dependencies/glfw/lib-vc2015;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86 - $(SolutionDir)dependencies/glfw/lib-vc2015/x64;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(NETFXKitsDir)Lib\um\x64 - $(SolutionDir)dependencies/imgui;$(SolutionDir)dependencies/glfw/include;$(SolutionDir)dependencies/glm;$(SolutionDir)dependencies/stb;$(VC_IncludePath);$(WindowsSDK_IncludePath); - $(SolutionDir)dependencies\$(ProjectName)\$(Platform)\$(Configuration)\ + $(ProjectDir)..\dependencies/glfw/lib-vc2015/64Bit;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(NETFXKitsDir)Lib\um\x64 + $(ProjectDir)..\dependencies/imgui;$(ProjectDir)..\dependencies/glfw/include;$(ProjectDir)..\dependencies/glm;$(ProjectDir)..\dependencies/stb;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir)dependencies/imgui;$(SolutionDir)dependencies/glfw/include;$(SolutionDir)dependencies/glm;$(SolutionDir)dependencies/stb;$(VC_IncludePath);$(WindowsSDK_IncludePath); + $(ProjectDir)build\$(Platform)\$(Configuration)\ $(SolutionDir)temp\$(ProjectName)\$(Platform)\$(Configuration)\ $(ProjectName) - $(SolutionDir)dependencies/imgui;$(SolutionDir)dependencies/glfw/include;$(SolutionDir)dependencies/glm;$(SolutionDir)dependencies/stb;$(VC_IncludePath);$(WindowsSDK_IncludePath); - $(SolutionDir)dependencies\$(ProjectName)\$(Platform)\$(Configuration)\ + $(ProjectDir)..\dependencies/imgui;$(ProjectDir)..\dependencies/glfw/include;$(ProjectDir)..\dependencies/glm;$(ProjectDir)..\dependencies/stb;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(ProjectDir)..\dependencies/imgui;$(ProjectDir)..\dependencies/glfw/include;$(ProjectDir)..\dependencies/glm;$(ProjectDir)..\dependencies/stb;$(VC_IncludePath);$(WindowsSDK_IncludePath) + $(ProjectDir)build\$(Platform)\$(Configuration)\ $(SolutionDir)temp\$(ProjectName)\$(Platform)\$(Configuration)\ - $(SolutionDir)dependencies/glfw/lib-vc2015;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86 + $(ProjectDir)..\dependencies/glfw/lib-vc2015;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86 - $(SolutionDir)dependencies/glfw/lib-vc2015/x64;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(NETFXKitsDir)Lib\um\x64 - $(SolutionDir)dependencies/imgui;$(SolutionDir)dependencies/glfw/include;$(SolutionDir)dependencies/glm;$(SolutionDir)dependencies/stb;$(VC_IncludePath);$(WindowsSDK_IncludePath); - $(SolutionDir)dependencies\$(ProjectName)\$(Platform)\$(Configuration)\ + $(ProjectDir)..\dependencies/glfw/lib-vc2015/64Bit;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(NETFXKitsDir)Lib\um\x64 + $(ProjectDir)..\dependencies/imgui;$(ProjectDir)..\dependencies/glfw/include;$(ProjectDir)..\dependencies/glm;$(ProjectDir)..\dependencies/stb;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(ProjectDir)..\dependencies/imgui;$(ProjectDir)..\dependencies/glfw/include;$(ProjectDir)..\dependencies/glm;$(ProjectDir)..\dependencies/stb;$(VC_IncludePath);$(WindowsSDK_IncludePath); + $(ProjectDir)build\$(Platform)\$(Configuration)\ $(SolutionDir)temp\$(ProjectName)\$(Platform)\$(Configuration)\ $(ProjectName) diff --git a/dependencies/glfw/lib-vc2015/x64/glfw3.dll b/dependencies/glfw/lib-vc2015/64Bit/glfw3.dll similarity index 100% rename from dependencies/glfw/lib-vc2015/x64/glfw3.dll rename to dependencies/glfw/lib-vc2015/64Bit/glfw3.dll diff --git a/dependencies/glfw/lib-vc2015/x64/glfw3.lib b/dependencies/glfw/lib-vc2015/64Bit/glfw3.lib similarity index 100% rename from dependencies/glfw/lib-vc2015/x64/glfw3.lib rename to dependencies/glfw/lib-vc2015/64Bit/glfw3.lib diff --git a/dependencies/glfw/lib-vc2015/x64/glfw3dll.lib b/dependencies/glfw/lib-vc2015/64Bit/glfw3dll.lib similarity index 100% rename from dependencies/glfw/lib-vc2015/x64/glfw3dll.lib rename to dependencies/glfw/lib-vc2015/64Bit/glfw3dll.lib diff --git a/project2D/Project2D.vcxproj b/project2D/Project2D.vcxproj index 1c8741e9..29484258 100644 --- a/project2D/Project2D.vcxproj +++ b/project2D/Project2D.vcxproj @@ -18,8 +18,17 @@ x64 + + + + + + + + + - {3F428D0C-1CC8-47C3-818A-A3C2972C74C9} + {CF0D9081-7DDB-49F6-931A-9CA64CE10369} Win32Proj Project2D 10.0.17763.0 @@ -71,7 +80,7 @@ true - $(SolutionDir)temp\$(ProjectName)\$(Platform)\$(Configuration)\ + $(SolutionDir)build\$(ProjectName)\$(Platform)\$(Configuration)\ $(SolutionDir)temp\$(ProjectName)\$(Platform)\$(Configuration)\ $(IncludePath) $(LibraryPath) @@ -85,7 +94,7 @@ false - $(SolutionDir)temp\$(ProjectName)\$(Platform)\$(Configuration)\ + $(SolutionDir)build\$(ProjectName)\$(Platform)\$(Configuration)\ $(SolutionDir)temp\$(ProjectName)\$(Platform)\$(Configuration)\ $(IncludePath) $(LibraryPath) @@ -104,13 +113,13 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - $(SolutionDir)bootstrap;$(SolutionDir)dependencies/imgui;$(SolutionDir)dependencies/glm;%(AdditionalIncludeDirectories) + $(ProjectDir)..\bootstrap;$(ProjectDir)..\dependencies/imgui;$(ProjectDir)..\dependencies/glm;%(AdditionalIncludeDirectories) Console true bootstrap.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - $(SolutionDir)dependencies\Bootstrap\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories) + $(ProjectDir)..\Bootstrap\build\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories) @@ -120,8 +129,10 @@ Level3 Disabled _DEBUG;_CONSOLE;%(PreprocessorDefinitions) - $(SolutionDir)bootstrap;$(SolutionDir)dependencies/imgui;$(SolutionDir)dependencies/glm;%(AdditionalIncludeDirectories) + $(ProjectDir)..\bootstrap;$(ProjectDir)..\dependencies/imgui;$(ProjectDir)..\dependencies/glm;%(AdditionalIncludeDirectories) MultiThreadedDebugDLL + + Console @@ -139,7 +150,7 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - $(SolutionDir)bootstrap;$(SolutionDir)dependencies/imgui;$(SolutionDir)dependencies/glm;%(AdditionalIncludeDirectories) + $(ProjectDir)..\bootstrap;$(ProjectDir)..\dependencies/imgui;$(ProjectDir)..\dependencies/glm;%(AdditionalIncludeDirectories) Console @@ -147,7 +158,7 @@ true true bootstrap.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - $(SolutionDir)dependencies\Bootstrap\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories) + $(ProjectDir)..\Bootstrap\build\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories) @@ -159,7 +170,9 @@ true true NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - $(SolutionDir)bootstrap;$(SolutionDir)dependencies/imgui;$(SolutionDir)dependencies/glm;%(AdditionalIncludeDirectories) + $(ProjectDir)..\bootstrap;$(ProjectDir)..\dependencies/imgui;$(ProjectDir)..\dependencies/glm;%(AdditionalIncludeDirectories) + + Console @@ -167,18 +180,9 @@ true true bootstrap.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - $(SolutionDir)dependencies\Bootstrap\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories) + $(ProjectDir)..\Bootstrap\build\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories) - - - - - - - - - diff --git a/project2D/Project2D.vcxproj.filters b/project2D/Project2D.vcxproj.filters index 5257c0b3..3719d4e2 100644 --- a/project2D/Project2D.vcxproj.filters +++ b/project2D/Project2D.vcxproj.filters @@ -15,21 +15,21 @@ - + Source Files - + Source Files - + Source Files - + Header Files - + Header Files diff --git a/project2D/Project2D.vcxproj.user b/project2D/Project2D.vcxproj.user index 26d62bfc..d05cfb2a 100644 --- a/project2D/Project2D.vcxproj.user +++ b/project2D/Project2D.vcxproj.user @@ -1,19 +1,23 @@  - $(SolutionDir)bin\ + $(ProjectDir)..\bin\ WindowsLocalDebugger + + - $(SolutionDir)bin\ + $(ProjectDir)..\bin\ WindowsLocalDebugger - $(SolutionDir)bin\ + $(ProjectDir)..\bin\ WindowsLocalDebugger + + - $(SolutionDir)bin\ + $(ProjectDir)..\bin\ WindowsLocalDebugger \ No newline at end of file