Skip to content
This repository was archived by the owner on Jan 5, 2024. It is now read-only.

Commit a61df22

Browse files
committed
Missed some changes to preprocessor definitions, include directories and linker inputs - (followup to 1405a19)
A note on iterator debugging: My Boost 1.55 binaries were built with it enabled, I had no control over that, so I had to enable it for the debug builds, otherwise it wouldn't build because of a mismatch. From what I gathered it can impact the performance of the debugger because all the extra stuff it needs to do but I can't confirm. I tried the "_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH" definition in hopes to preserve the current behavior, but this ended up with the exes insta-crashing. This is life now.
1 parent ffdf06d commit a61df22

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

RTEA.vcxproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@
7979
<ClCompile>
8080
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
8181
<Optimization>Disabled</Optimization>
82-
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)System;$(ProjectDir)Entities;$(ProjectDir)Activities;$(ProjectDir)Managers;$(ProjectDir)Menus;$(ProjectDir)GUI;$(ProjectDir)external\include;$(ProjectDir)external\include\boost-1_69_0;$(ProjectDir)external\sources\RakNet;${ProjectDir)external\include\LZ4;${ProjectDir)external\include\fmod</AdditionalIncludeDirectories>
83-
<PreprocessorDefinitions>WIN32;DEBUG_BUILD;_WINDOWS;DEBUGMODE;_CRT_SECURE_NO_DEPRECATE;_HAS_ITERATOR_DEBUGGING=0;ALLEGRO_STATICLINK;ALLEGRO_NO_ASM;ALLEGRO_NO_STD_HEADERS;ZLIB_WINAPI;__USE_SOUND_FMOD_OFF;__USE_SOUND_GORILLA;__OPEN_SOURCE_EDITION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
82+
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)System;$(ProjectDir)Entities;$(ProjectDir)Activities;$(ProjectDir)Managers;$(ProjectDir)Menus;$(ProjectDir)GUI;$(ProjectDir)external\include;$(ProjectDir)external\include\boost-1_55_0;$(ProjectDir)external\sources\RakNet;${ProjectDir)external\include\LZ4;${ProjectDir)external\include\fmod</AdditionalIncludeDirectories>
83+
<PreprocessorDefinitions>WIN32;DEBUG_BUILD;_WINDOWS;DEBUGMODE;_CRT_SECURE_NO_DEPRECATE;_HAS_ITERATOR_DEBUGGING=1;_ITERATOR_DEBUG_LEVEL=2;ALLEGRO_STATICLINK;ALLEGRO_NO_ASM;ALLEGRO_NO_STD_HEADERS;ZLIB_WINAPI;__USE_SOUND_FMOD_OFF;__USE_SOUND_GORILLA;__OPEN_SOURCE_EDITION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
8484
<MinimalRebuild>false</MinimalRebuild>
8585
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
8686
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -187,7 +187,7 @@
187187
<PrecompiledHeaderFile>StandardIncludes.h</PrecompiledHeaderFile>
188188
</ClCompile>
189189
<Link>
190-
<AdditionalDependencies>lua515.x86.release.lib;luabind.x86.release.lib;ws2_32.lib;zlibwapi.lib;alleg_s_c.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;ole32.lib;dinput.lib;dinput8.lib;ddraw.lib;dxguid.lib;winmm.lib;dsound.lib;gorilla.lib;legacy_stdio_definitions.lib;liblz4.lib;libboost_thread-vc141-mt-x32-1_55.lib;libboost_date_time-vc141-mt-x32-1_55.lib;libboost_system-vc141-mt-x32-1_55.lib;libboost_chrono-vc141-mt-x32-1_55.lib;fmodvc.lib;%(AdditionalDependencies)</AdditionalDependencies>
190+
<AdditionalDependencies>lua515.x86.release.lib;luabind.x86.release.lib;ws2_32.lib;zlibwapi.lib;alleg_s_c.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;ole32.lib;dinput.lib;dinput8.lib;ddraw.lib;dxguid.lib;winmm.lib;dsound.lib;gorilla.lib;legacy_stdio_definitions.lib;liblz4.lib;libboost_thread-vc141-mt-x32-1_55.lib;libboost_date_time-vc141-mt-x32-1_55.lib;libboost_system-vc141-mt-x32-1_55.lib;libboost_chrono-vc141-mt-x32-1_55.lib;%(AdditionalDependencies)</AdditionalDependencies>
191191
<OutputFile>$(OutDir)Cortex Command.exe</OutputFile>
192192
<AdditionalLibraryDirectories>external/lib/win;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
193193
<GenerateDebugInformation>false</GenerateDebugInformation>

0 commit comments

Comments
 (0)