Skip to content

Commit 41657a2

Browse files
committed
Clean up remaining references to profile library
1 parent d9a5cfb commit 41657a2

File tree

4 files changed

+4
-22
lines changed

4 files changed

+4
-22
lines changed

Core/Libraries/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
# WW common libraries decended from earliest C&C games
22
add_subdirectory(Source/WWVegas)
33

4-
# profiling library
5-
add_subdirectory(Source/profile)
6-
74
# debugging library
85
add_subdirectory(Source/debug)
96

Core/Libraries/Source/debug/debug.h

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
Generally speaking there are four different library variants:
3939
- Internal: all asserts/checks/logs, full optimizations (RTS_INTERNAL macro defined)
4040
- %Debug: all asserts/checks/logs, no optimizations (RTS_DEBUG macro defined)
41-
- Profile: all asserts/checks/logs, full optimizations, profiling active (RTS_PROFILE macro defined)
4241
- Release: no asserts/checks/logs, full optimizations
4342
4443
These variants will be broken down into separate features which
@@ -49,7 +48,6 @@
4948
<td><b>HAS_ASSERTS</b></td>
5049
<td><b>HAS_LOGS</b></td>
5150
<td><b>HAS_OPT</b></td>
52-
<td><b>HAS_PROFILE</b></td>
5351
</tr><tr>
5452
<td>Internal</td>
5553
<td><center>Y</center></td>
@@ -62,12 +60,6 @@
6260
<td><center>Y</center></td>
6361
<td><center></center></td>
6462
<td><center></center></td>
65-
</tr><tr>
66-
<td>Profile</td>
67-
<td><center>Y</center></td>
68-
<td><center>Y</center></td>
69-
<td><center>Y</center></td>
70-
<td><center>Y</center></td>
7163
</tr><tr>
7264
<td>Release</td>
7365
<td><center></center></td>
@@ -80,7 +72,6 @@
8072
library variant:
8173
- Internal: XXXInternal.lib
8274
- %Debug: XXXDebug.lib
83-
- Profile: XXXProfile.lib
8475
- Release: XXX.lib
8576
*/
8677

@@ -89,7 +80,7 @@
8980
#endif
9081

9182
// Define which libraries to use.
92-
#if defined(RTS_INTERNAL) || defined(RTS_DEBUG) || defined(RTS_PROFILE)
83+
#if defined(RTS_INTERNAL) || defined(RTS_DEBUG)
9384
# define HAS_ASSERTS
9485
# define HAS_LOGS
9586
#endif
@@ -98,10 +89,6 @@
9889
# define HAS_OPT
9990
#endif
10091

101-
#if defined(RTS_PROFILE)
102-
# define HAS_PROFILE
103-
#endif
104-
10592
// include all our public header files (use double quotes here)
10693
#include "debug_doc.h"
10794
#include "debug_macro.h"

Core/Libraries/Source/debug/debug_debug.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1441,8 +1441,6 @@ void Debug::WriteBuildInfo(void)
14411441
operator<<(" internal");
14421442
#elif defined(RTS_DEBUG)
14431443
operator<<(" debug");
1444-
#elif defined(RTS_PROFILE)
1445-
operator<<(" profile");
14461444
#else
14471445
operator<<(" release");
14481446
#endif

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ enum
101101

102102
static Bool raiseMessageBoxes = TRUE;
103103
static Bool campaignSelected = FALSE;
104-
#if defined RTS_DEBUG || defined RTS_INTERNAL || defined RTS_PROFILE
104+
#if defined RTS_DEBUG || defined RTS_INTERNAL
105105
static NameKeyType campaignID = NAMEKEY_INVALID;
106106
static GameWindow *buttonCampaign = NULL;
107107
#ifdef TEST_COMPRESSION
@@ -554,7 +554,7 @@ void MainMenuInit( WindowLayout *layout, void *userData )
554554

555555
showSelectiveButtons(SHOW_NONE);
556556
// Set up the version number
557-
#if defined RTS_DEBUG || defined RTS_INTERNAL || defined RTS_PROFILE
557+
#if defined RTS_DEBUG || defined RTS_INTERNAL
558558
WinInstanceData instData;
559559
#ifdef TEST_COMPRESSION
560560
instData.init();
@@ -1309,7 +1309,7 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg,
13091309

13101310
if(buttonPushed)
13111311
break;
1312-
#if defined RTS_DEBUG || defined RTS_INTERNAL || defined RTS_PROFILE
1312+
#if defined RTS_DEBUG || defined RTS_INTERNAL
13131313
if( control == buttonCampaign )
13141314
{
13151315
buttonPushed = TRUE;

0 commit comments

Comments
 (0)