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

Commit 88947b7

Browse files
committed
Re-added Fmod 3.75 headers and binaries and enabled preprocessor definition to use Fmod (revert 69abfbe and 93b80d1)
1 parent a61df22 commit 88947b7

File tree

8 files changed

+1890
-11
lines changed

8 files changed

+1890
-11
lines changed

.gitignore

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,4 @@ MemCleanupInfo.txt
4646
/_Allegro-4.2.3.1-Custom/Allegro/build/msvc8/.vs
4747
/_Allegro-4.2.3.1-Custom/Allegro/lib
4848
/_Allegro-4.2.3.1-Custom/Allegro/obj
49-
Doxygen/Output/
50-
51-
/external/include/fmod
52-
/external/lib/win/fmodvc.lib
53-
/external/lib/win/fmod.dll
49+
Doxygen/Output/

RTEA.vcxproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
8181
<Optimization>Disabled</Optimization>
8282
<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>
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;__USE_SOUND_GORILLA_OFF;__OPEN_SOURCE_EDITION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
8484
<MinimalRebuild>false</MinimalRebuild>
8585
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
8686
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -95,7 +95,7 @@
9595
<PrecompiledHeaderFile>StandardIncludes.h</PrecompiledHeaderFile>
9696
</ClCompile>
9797
<Link>
98-
<AdditionalDependencies>lua515.x86.debug.lib;luabind.x86.debug.lib;ws2_32.lib;zlibwapi.lib;alld_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;libboost_thread-vc141-mt-gd-x32-1_55.lib;libboost_date_time-vc141-mt-gd-x32-1_55.lib;libboost_system-vc141-mt-gd-x32-1_55.lib;libboost_chrono-vc141-mt-gd-x32-1_55.lib;gorillaD.lib;legacy_stdio_definitions.lib;liblz4.lib;%(AdditionalDependencies)</AdditionalDependencies>
98+
<AdditionalDependencies>lua515.x86.debug.lib;luabind.x86.debug.lib;ws2_32.lib;zlibwapi.lib;alld_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;libboost_thread-vc141-mt-gd-x32-1_55.lib;libboost_date_time-vc141-mt-gd-x32-1_55.lib;libboost_system-vc141-mt-gd-x32-1_55.lib;libboost_chrono-vc141-mt-gd-x32-1_55.lib;gorillaD.lib;legacy_stdio_definitions.lib;liblz4.lib;fmodvc.lib;%(AdditionalDependencies)</AdditionalDependencies>
9999
<OutputFile>$(OutDir)Cortex Command.debug.exe</OutputFile>
100100
<AdditionalLibraryDirectories>external/lib/win;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
101101
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -122,7 +122,7 @@
122122
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
123123
<Optimization>Disabled</Optimization>
124124
<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>
125-
<PreprocessorDefinitions>WIN32;MIN_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>
125+
<PreprocessorDefinitions>WIN32;MIN_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;__USE_SOUND_GORILLA_OFF;__OPEN_SOURCE_EDITION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
126126
<MinimalRebuild>false</MinimalRebuild>
127127
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
128128
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -137,7 +137,7 @@
137137
<PrecompiledHeaderFile>StandardIncludes.h</PrecompiledHeaderFile>
138138
</ClCompile>
139139
<Link>
140-
<AdditionalDependencies>lua515.x86.debug.lib;luabind.x86.debug.lib;ws2_32.lib;zlibwapi.lib;alld_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;libboost_thread-vc141-mt-gd-x32-1_55.lib;libboost_date_time-vc141-mt-gd-x32-1_55.lib;libboost_system-vc141-mt-gd-x32-1_55.lib;libboost_chrono-vc141-mt-gd-x32-1_55.lib;gorillaD.lib;legacy_stdio_definitions.lib;liblz4.lib;%(AdditionalDependencies)</AdditionalDependencies>
140+
<AdditionalDependencies>lua515.x86.debug.lib;luabind.x86.debug.lib;ws2_32.lib;zlibwapi.lib;alld_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;libboost_thread-vc141-mt-gd-x32-1_55.lib;libboost_date_time-vc141-mt-gd-x32-1_55.lib;libboost_system-vc141-mt-gd-x32-1_55.lib;libboost_chrono-vc141-mt-gd-x32-1_55.lib;gorillaD.lib;legacy_stdio_definitions.lib;liblz4.lib;fmodvc.lib;%(AdditionalDependencies)</AdditionalDependencies>
141141
<OutputFile>$(OutDir)Cortex Command.debug.minimal.exe</OutputFile>
142142
<AdditionalLibraryDirectories>external/lib/win;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
143143
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -167,7 +167,7 @@
167167
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
168168
<WholeProgramOptimization>true</WholeProgramOptimization>
169169
<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>
170-
<PreprocessorDefinitions>FINALRELASE;WIN32;NDEBUG;_WINDOWS;_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>
170+
<PreprocessorDefinitions>FINALRELASE;WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_HAS_ITERATOR_DEBUGGING=0;ALLEGRO_STATICLINK;ALLEGRO_NO_ASM;ALLEGRO_NO_STD_HEADERS;ZLIB_WINAPI;__USE_SOUND_FMOD;__USE_SOUND_GORILLA_OFF;__OPEN_SOURCE_EDITION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
171171
<ExceptionHandling>Sync</ExceptionHandling>
172172
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
173173
<BufferSecurityCheck>false</BufferSecurityCheck>
@@ -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;%(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;fmodvc.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)