Skip to content

Commit cbe64e3

Browse files
CEbbinghausCEbbinghaus
committed
Fixed Issues pertaining to Different Build Versions
1 parent ee2ed86 commit cbe64e3

File tree

6 files changed

+21
-13
lines changed

6 files changed

+21
-13
lines changed

‎bootstrap/Bootstrap.vcxproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -70,28 +70,28 @@
7070
</ImportGroup>
7171
<PropertyGroup Label="UserMacros" />
7272
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
73-
<IncludePath>$(ProjectDir)..\dependencies/imgui;$(ProjectDir)..\dependencies/glfw/include;$(ProjectDir)..\dependencies/glm;$(ProjectDir)..\dependencies/stb;$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
73+
<IncludePath>$(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)</IncludePath>
7474
<OutDir>$(ProjectDir)build\$(Platform)\$(Configuration)\</OutDir>
7575
<IntDir>$(SolutionDir)temp\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
7676
<LibraryPath>$(ProjectDir)..\dependencies/glfw/lib-vc2015;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86</LibraryPath>
7777
</PropertyGroup>
7878
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
79-
<LibraryPath>$(SolutionDir)dependencies/glfw/lib-vc2015/x64;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(NETFXKitsDir)Lib\um\x64</LibraryPath>
80-
<IncludePath>$(SolutionDir)dependencies/imgui;$(SolutionDir)dependencies/glfw/include;$(SolutionDir)dependencies/glm;$(SolutionDir)dependencies/stb;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
81-
<OutDir>$(SolutionDir)dependencies\$(ProjectName)\$(Platform)\$(Configuration)\</OutDir>
79+
<LibraryPath>$(ProjectDir)..\dependencies/glfw/lib-vc2015/64Bit;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(NETFXKitsDir)Lib\um\x64</LibraryPath>
80+
<IncludePath>$(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);</IncludePath>
81+
<OutDir>$(ProjectDir)build\$(Platform)\$(Configuration)\</OutDir>
8282
<IntDir>$(SolutionDir)temp\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
8383
<TargetName>$(ProjectName)</TargetName>
8484
</PropertyGroup>
8585
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
86-
<IncludePath>$(ProjectDir)..\dependencies/imgui;$(ProjectDir)..\dependencies/glfw/include;$(ProjectDir)..\dependencies/glm;$(ProjectDir)..\dependencies/stb;$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
86+
<IncludePath>$(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)</IncludePath>
8787
<OutDir>$(ProjectDir)build\$(Platform)\$(Configuration)\</OutDir>
8888
<IntDir>$(SolutionDir)temp\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
8989
<LibraryPath>$(ProjectDir)..\dependencies/glfw/lib-vc2015;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86</LibraryPath>
9090
</PropertyGroup>
9191
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
92-
<LibraryPath>$(SolutionDir)dependencies/glfw/lib-vc2015/x64;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(NETFXKitsDir)Lib\um\x64</LibraryPath>
93-
<IncludePath>$(SolutionDir)dependencies/imgui;$(SolutionDir)dependencies/glfw/include;$(SolutionDir)dependencies/glm;$(SolutionDir)dependencies/stb;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
94-
<OutDir>$(SolutionDir)dependencies\$(ProjectName)\$(Platform)\$(Configuration)\</OutDir>
92+
<LibraryPath>$(ProjectDir)..\dependencies/glfw/lib-vc2015/64Bit;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(NETFXKitsDir)Lib\um\x64</LibraryPath>
93+
<IncludePath>$(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);</IncludePath>
94+
<OutDir>$(ProjectDir)build\$(Platform)\$(Configuration)\</OutDir>
9595
<IntDir>$(SolutionDir)temp\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
9696
<TargetName>$(ProjectName)</TargetName>
9797
</PropertyGroup>

dependencies/glfw/lib-vc2015/x64/glfw3.dll renamed to dependencies/glfw/lib-vc2015/64Bit/glfw3.dll

File renamed without changes.

dependencies/glfw/lib-vc2015/x64/glfw3.lib renamed to dependencies/glfw/lib-vc2015/64Bit/glfw3.lib

File renamed without changes.

dependencies/glfw/lib-vc2015/x64/glfw3dll.lib renamed to dependencies/glfw/lib-vc2015/64Bit/glfw3dll.lib

File renamed without changes.

‎project2D/Project2D.vcxproj‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,10 @@
120120
<WarningLevel>Level3</WarningLevel>
121121
<Optimization>Disabled</Optimization>
122122
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
123-
<AdditionalIncludeDirectories>$(SolutionDir)bootstrap;$(SolutionDir)dependencies/imgui;$(SolutionDir)dependencies/glm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
123+
<AdditionalIncludeDirectories>$(ProjectDir)..\bootstrap;$(ProjectDir)..\dependencies/imgui;$(ProjectDir)..\dependencies/glm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
124124
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
125+
<AdditionalUsingDirectories>
126+
</AdditionalUsingDirectories>
125127
</ClCompile>
126128
<Link>
127129
<SubSystem>Console</SubSystem>
@@ -159,15 +161,17 @@
159161
<FunctionLevelLinking>true</FunctionLevelLinking>
160162
<IntrinsicFunctions>true</IntrinsicFunctions>
161163
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
162-
<AdditionalIncludeDirectories>$(SolutionDir)bootstrap;$(SolutionDir)dependencies/imgui;$(SolutionDir)dependencies/glm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
164+
<AdditionalIncludeDirectories>$(ProjectDir)..\bootstrap;$(ProjectDir)..\dependencies/imgui;$(ProjectDir)..\dependencies/glm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
165+
<AdditionalUsingDirectories>
166+
</AdditionalUsingDirectories>
163167
</ClCompile>
164168
<Link>
165169
<SubSystem>Console</SubSystem>
166170
<GenerateDebugInformation>true</GenerateDebugInformation>
167171
<EnableCOMDATFolding>true</EnableCOMDATFolding>
168172
<OptimizeReferences>true</OptimizeReferences>
169173
<AdditionalDependencies>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)</AdditionalDependencies>
170-
<AdditionalLibraryDirectories>$(SolutionDir)dependencies\Bootstrap\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
174+
<AdditionalLibraryDirectories>$(ProjectDir)..\Bootstrap\build\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
171175
</Link>
172176
</ItemDefinitionGroup>
173177
<ItemGroup>

‎project2D/Project2D.vcxproj.user‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,21 @@
33
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
44
<LocalDebuggerWorkingDirectory>$(ProjectDir)..\bin\</LocalDebuggerWorkingDirectory>
55
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
6+
<LocalDebuggerCommandArguments>
7+
</LocalDebuggerCommandArguments>
68
</PropertyGroup>
79
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
8-
<LocalDebuggerWorkingDirectory>$(SolutionDir)bin\</LocalDebuggerWorkingDirectory>
10+
<LocalDebuggerWorkingDirectory>$(ProjectDir)..\bin\</LocalDebuggerWorkingDirectory>
911
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
1012
</PropertyGroup>
1113
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
1214
<LocalDebuggerWorkingDirectory>$(ProjectDir)..\bin\</LocalDebuggerWorkingDirectory>
1315
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
16+
<LocalDebuggerCommandArguments>
17+
</LocalDebuggerCommandArguments>
1418
</PropertyGroup>
1519
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
16-
<LocalDebuggerWorkingDirectory>$(SolutionDir)bin\</LocalDebuggerWorkingDirectory>
20+
<LocalDebuggerWorkingDirectory>$(ProjectDir)..\bin\</LocalDebuggerWorkingDirectory>
1721
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
1822
</PropertyGroup>
1923
</Project>

0 commit comments

Comments
 (0)