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

Commit f563ac1

Browse files
MaximDudeMaximDude
committed
Cleaned up project a little bit
Removed junk includes Set manifests and other junk to generate in intermediate directory instead of output directory Removed weird unused snprintf.h
1 parent 7a28890 commit f563ac1

File tree

4 files changed

+30
-450
lines changed

4 files changed

+30
-450
lines changed

‎Managers/AchievementMan.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
#include "AchievementMan.h"
22
#include "ConsoleMan.h"
33

4-
#include "snprintf.h"
5-
64
using namespace std;
75

86
namespace RTE

‎RTEA.vcxproj

Lines changed: 30 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
<ClCompile>
8080
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
8181
<Optimization>Disabled</Optimization>
82-
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)System;$(ProjectDir)Entities;$(ProjectDir)Managers;$(ProjectDir)Menus;$(ProjectDir)GUI;$(ProjectDir)external\include\steam;$(ProjectDir)external\include\fmod;$(ProjectDir)external\include\luabind\2017;$(ProjectDir)external\include;$(ProjectDir)external\include\boost-1_69_0;$(ProjectDir)external\include\SDL;$(ProjectDir)external\include\SDL_mixer;$(ProjectDir)external\sources\RakNet;$(ProjectDir)System\LZ4</AdditionalIncludeDirectories>
82+
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)System;$(ProjectDir)Entities;$(ProjectDir)Managers;$(ProjectDir)Menus;$(ProjectDir)GUI;$(ProjectDir)external\include\luabind\2017;$(ProjectDir)external\include;$(ProjectDir)external\include\boost-1_69_0;$(ProjectDir)external\include\SDL;$(ProjectDir)external\include\SDL_mixer;$(ProjectDir)external\sources\RakNet;$(ProjectDir)System\LZ4</AdditionalIncludeDirectories>
8383
<PreprocessorDefinitions>WIN32;DEBUG_BUILD;_WINDOWS;DEBUGMODE;_CRT_SECURE_NO_DEPRECATE;_HAS_ITERATOR_DEBUGGING=0;ALLEGRO_STATICLINK;ALLEGRO_NO_ASM;ZLIB_WINAPI;__USE_SOUND_SDLMIXER_OFF;__USE_SOUND_FMOD_OFF;__USE_SOUND_GORILLA;__OPEN_SOURCE_EDITION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
8484
<MinimalRebuild>false</MinimalRebuild>
8585
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -107,12 +107,21 @@
107107
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
108108
<ShowProgress>LinkVerbose</ShowProgress>
109109
</Link>
110+
<Manifest>
111+
<OutputManifestFile>$(IntDir)$(TargetName).manifest</OutputManifestFile>
112+
</Manifest>
113+
<Xdcmake>
114+
<OutputFile>$(IntDir)$(TargetName).xml</OutputFile>
115+
</Xdcmake>
116+
<Bscmake>
117+
<OutputFile>$(IntDir)$(TargetName).bsc</OutputFile>
118+
</Bscmake>
110119
</ItemDefinitionGroup>
111120
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Minimal Debug Open Source|Win32'">
112121
<ClCompile>
113122
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
114123
<Optimization>Disabled</Optimization>
115-
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)System;$(ProjectDir)Entities;$(ProjectDir)Managers;$(ProjectDir)Menus;$(ProjectDir)GUI;$(ProjectDir)external\include\steam;$(ProjectDir)external\include\fmod;$(ProjectDir)external\include\luabind\2017;$(ProjectDir)external\include;$(ProjectDir)external\include\boost-1_69_0;$(ProjectDir)external\include\SDL;$(ProjectDir)external\include\SDL_mixer;$(ProjectDir)external\sources\RakNet;$(ProjectDir)System\LZ4</AdditionalIncludeDirectories>
124+
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)System;$(ProjectDir)Entities;$(ProjectDir)Managers;$(ProjectDir)Menus;$(ProjectDir)GUI;$(ProjectDir)external\include\luabind\2017;$(ProjectDir)external\include;$(ProjectDir)external\include\boost-1_69_0;$(ProjectDir)external\include\SDL;$(ProjectDir)external\include\SDL_mixer;$(ProjectDir)external\sources\RakNet;$(ProjectDir)System\LZ4</AdditionalIncludeDirectories>
116125
<PreprocessorDefinitions>WIN32;MIN_DEBUG_BUILD;_WINDOWS;DEBUGMODE;_CRT_SECURE_NO_DEPRECATE;_HAS_ITERATOR_DEBUGGING=0;ALLEGRO_STATICLINK;ALLEGRO_NO_ASM;ZLIB_WINAPI;__USE_SOUND_SDLMIXER_OFF;__USE_SOUND_FMOD_OFF;__USE_SOUND_GORILLA;__OPEN_SOURCE_EDITION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
117126
<MinimalRebuild>false</MinimalRebuild>
118127
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -140,6 +149,15 @@
140149
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
141150
<ShowProgress>LinkVerbose</ShowProgress>
142151
</Link>
152+
<Manifest>
153+
<OutputManifestFile>$(IntDir)$(TargetName).manifest</OutputManifestFile>
154+
</Manifest>
155+
<Xdcmake>
156+
<OutputFile>$(IntDir)$(TargetName).xml</OutputFile>
157+
</Xdcmake>
158+
<Bscmake>
159+
<OutputFile>$(IntDir)$(TargetName).bsc</OutputFile>
160+
</Bscmake>
143161
</ItemDefinitionGroup>
144162
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Final Open Source|Win32'">
145163
<ClCompile>
@@ -148,7 +166,7 @@
148166
<IntrinsicFunctions>true</IntrinsicFunctions>
149167
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
150168
<WholeProgramOptimization>true</WholeProgramOptimization>
151-
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)System;$(ProjectDir)Entities;$(ProjectDir)Managers;$(ProjectDir)Menus;$(ProjectDir)GUI;$(ProjectDir)external\include\steam;$(ProjectDir)external\include\fmod;$(ProjectDir)external\include\luabind\2017;$(ProjectDir)external\include;$(ProjectDir)external\include\boost-1_69_0;$(ProjectDir)external\sources\RakNet;$(ProjectDir)System\LZ4;$(ProjectDir)external\include\SDL;$(ProjectDir)external\include\SDL_mixer</AdditionalIncludeDirectories>
169+
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)System;$(ProjectDir)Entities;$(ProjectDir)Managers;$(ProjectDir)Menus;$(ProjectDir)GUI;$(ProjectDir)external\include\luabind\2017;$(ProjectDir)external\include;$(ProjectDir)external\include\boost-1_69_0;$(ProjectDir)external\sources\RakNet;$(ProjectDir)System\LZ4;$(ProjectDir)external\include\SDL;$(ProjectDir)external\include\SDL_mixer</AdditionalIncludeDirectories>
152170
<PreprocessorDefinitions>FINALRELASE;WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_HAS_ITERATOR_DEBUGGING=0;ALLEGRO_STATICLINK;ALLEGRO_NO_ASM;ZLIB_WINAPI;__USE_SOUND_SDLMIXER_OFF;__USE_SOUND_FMOD_OFF;__USE_SOUND_GORILLA;__OPEN_SOURCE_EDITION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
153171
<ExceptionHandling>Sync</ExceptionHandling>
154172
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -182,68 +200,18 @@
182200
<FixedBaseAddress>false</FixedBaseAddress>
183201
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
184202
</Link>
203+
<Manifest>
204+
<OutputManifestFile>$(IntDir)$(TargetName).manifest</OutputManifestFile>
205+
</Manifest>
206+
<Xdcmake>
207+
<OutputFile>$(IntDir)$(TargetName).xml</OutputFile>
208+
</Xdcmake>
209+
<Bscmake>
210+
<OutputFile>$(IntDir)$(TargetName).bsc</OutputFile>
211+
</Bscmake>
185212
</ItemDefinitionGroup>
186213
<ItemGroup>
187214
<None Include="ccicon.ico" />
188-
<None Include="Base.rte\Activities.ini" />
189-
<None Include="Base.rte\AllegroConfig.txt" />
190-
<None Include="Base.rte\Index.ini" />
191-
<None Include="Base.rte\Materials.ini" />
192-
<None Include="Base.rte\Scenes.ini" />
193-
<None Include="Base.rte\Settings.ini" />
194-
<None Include="Base.rte\Sounds.ini" />
195-
<None Include="Base.rte\Terrains.ini" />
196-
<None Include="Base.rte\GUIs\AreaEditorGUI.ini" />
197-
<None Include="Base.rte\GUIs\AreaPickerGUI.ini" />
198-
<None Include="Base.rte\GUIs\BuyMenuGUI.ini" />
199-
<None Include="Base.rte\GUIs\ConsoleGUI.ini" />
200-
<None Include="Base.rte\GUIs\GibEditorGUI.ini" />
201-
<None Include="Base.rte\GUIs\LoadingGUI.ini" />
202-
<None Include="Base.rte\GUIs\MainMenuGUI.ini" />
203-
<None Include="Base.rte\GUIs\MetagameGUI.ini" />
204-
<None Include="Base.rte\GUIs\ObjectPickerGUI.ini" />
205-
<None Include="Base.rte\GUIs\SceneEditorGUI.ini" />
206-
<None Include="Base.rte\Effects.ini" />
207-
<None Include="Base.rte\Effects\Gibs\Gibs.ini" />
208-
<None Include="Base.rte\Effects\Pyro\Pyro.ini" />
209-
<None Include="Base.rte\Effects\Shards\Shards.ini" />
210-
<None Include="Base.rte\Effects\Wounds\Wounds.ini" />
211-
<None Include="Base.rte\Actors.ini" />
212-
<None Include="Base.rte\Actors\Brains\Brains.ini" />
213-
<None Include="Base.rte\Actors\Doors\Doors.ini" />
214-
<None Include="Base.rte\Actors\DropShips\DropShips.ini" />
215-
<None Include="Base.rte\Icons.ini" />
216-
<None Include="Base.rte\Actors\Robots\Robots.ini" />
217-
<None Include="Base.rte\Actors\Rockets\Rockets.ini" />
218-
<None Include="Base.rte\Actors\Rockets\RocketsNew.ini" />
219-
<None Include="Base.rte\Actors\Skeletons\Skeletons.ini" />
220-
<None Include="Base.rte\Actors\Coalition\Soldier.ini" />
221-
<None Include="Base.rte\Actors\Wildlife\Wildlife.ini" />
222-
<None Include="Base.rte\Actors\Zombies\Zombies.ini" />
223-
<None Include="Base.rte\Actors\Dummies\Dreadnought.ini" />
224-
<None Include="Base.rte\Actors\Dummies\Dropship.ini" />
225-
<None Include="Base.rte\Actors\Dummies\Dummies.ini" />
226-
<None Include="Base.rte\Actors\Dummies\Dummy\Dummy.ini" />
227-
<None Include="Base.rte\Ammo.ini" />
228-
<None Include="Base.rte\Devices\Artifacts\Artifacts.ini" />
229-
<None Include="Base.rte\Devices\Cannons\Cannons.ini" />
230-
<None Include="Base.rte\Devices.ini" />
231-
<None Include="Base.rte\Devices\Diggers\Diggers.ini" />
232-
<None Include="Base.rte\Devices\Explosives\Explosives.ini" />
233-
<None Include="Base.rte\Devices\Pistols\Pistols.ini" />
234-
<None Include="Base.rte\Devices\Rifles\Rifles.ini" />
235-
<None Include="Base.rte\Devices\Shields\Shields.ini" />
236-
<None Include="Base.rte\Devices\Shotguns\Shotguns.ini" />
237-
<None Include="Base.rte\Devices\SMGs\SMGs.ini" />
238-
<None Include="Base.rte\Devices\Sprayers\Sprayers.ini" />
239-
<None Include="Base.rte\Scenes\Objects\BunkerModules\BunkerModules.ini" />
240-
<None Include="Base.rte\Scenes\Editor.ini" />
241-
<None Include="Base.rte\Scenes\Grasslands.ini" />
242-
<None Include="Base.rte\Scenes\HorizLand.ini" />
243-
<None Include="Base.rte\Scenes\Physics Test.ini" />
244-
<None Include="Base.rte\Scenes\Tutorial Mission.ini" />
245-
<None Include="Base.rte\Scenes\Tutorial.ini" />
246-
<None Include="Base.rte\Scenes\Scripts\TestScript.lua" />
247215
<None Include="cpp.hint" />
248216
<None Include="external\sources\RakNet\RakNet.vcproj" />
249217
<None Include="external\sources\RakNet\RakNet_vc8.vcproj" />
@@ -414,7 +382,6 @@
414382
<ClInclude Include="Managers\NetworkServer.h" />
415383
<ClInclude Include="resource.h" />
416384
<ClInclude Include="System\Box.h" />
417-
<ClInclude Include="System\cctypes.h" />
418385
<ClInclude Include="System\Color.h" />
419386
<ClInclude Include="System\ContentFile.h" />
420387
<ClInclude Include="Entities\Controller.h" />
@@ -428,7 +395,6 @@
428395
<ClInclude Include="System\Reader.h" />
429396
<ClInclude Include="System\Serializable.h" />
430397
<ClInclude Include="System\Singleton.h" />
431-
<ClInclude Include="System\snprintf.h" />
432398
<ClInclude Include="System\StdString.h" />
433399
<ClInclude Include="System\System.h" />
434400
<ClInclude Include="System\Timer.h" />
@@ -447,37 +413,6 @@
447413
<ClInclude Include="System\InterGif\utils.h" />
448414
<ClInclude Include="System\InterGif\workspace.h" />
449415
<ClInclude Include="System\MD5\md5.h" />
450-
<ClInclude Include="System\Steam\include\isteamapps.h" />
451-
<ClInclude Include="System\Steam\include\isteamappticket.h" />
452-
<ClInclude Include="System\Steam\include\isteamclient.h" />
453-
<ClInclude Include="System\Steam\include\isteamcontroller.h" />
454-
<ClInclude Include="System\Steam\include\isteamfriends.h" />
455-
<ClInclude Include="System\Steam\include\isteamgamecoordinator.h" />
456-
<ClInclude Include="System\Steam\include\isteamgameserver.h" />
457-
<ClInclude Include="System\Steam\include\isteamgameserverstats.h" />
458-
<ClInclude Include="System\Steam\include\isteamhttp.h" />
459-
<ClInclude Include="System\Steam\include\isteammasterserverupdater.h" />
460-
<ClInclude Include="System\Steam\include\isteammatchmaking.h" />
461-
<ClInclude Include="System\Steam\include\isteamnetworking.h" />
462-
<ClInclude Include="System\Steam\include\isteamps3overlayrenderer.h" />
463-
<ClInclude Include="System\Steam\include\isteamremotestorage.h" />
464-
<ClInclude Include="System\Steam\include\isteamscreenshots.h" />
465-
<ClInclude Include="System\Steam\include\isteamugc.h" />
466-
<ClInclude Include="System\Steam\include\isteamunifiedmessages.h" />
467-
<ClInclude Include="System\Steam\include\isteamuser.h" />
468-
<ClInclude Include="System\Steam\include\isteamuserstats.h" />
469-
<ClInclude Include="System\Steam\include\isteamutils.h" />
470-
<ClInclude Include="System\Steam\include\matchmakingtypes.h" />
471-
<ClInclude Include="System\Steam\include\steam_api.h" />
472-
<ClInclude Include="System\Steam\include\steam_gameserver.h" />
473-
<ClInclude Include="System\Steam\include\steamclientpublic.h" />
474-
<ClInclude Include="System\Steam\include\steamcontrollerpublic.h" />
475-
<ClInclude Include="System\Steam\include\steamencryptedappticket.h" />
476-
<ClInclude Include="System\Steam\include\steamhttpenums.h" />
477-
<ClInclude Include="System\Steam\include\steamps3params.h" />
478-
<ClInclude Include="System\Steam\include\steamtypes.h" />
479-
<ClInclude Include="System\Steam\include\steamuniverse.h" />
480-
<ClInclude Include="System\Steam\include\steamvr.h" />
481416
<ClInclude Include="Managers\AchievementMan.h" />
482417
<ClInclude Include="Managers\ActivityMan.h" />
483418
<ClInclude Include="Managers\AudioMan.h" />

0 commit comments

Comments
 (0)