[GEN][ZH] Change _PROFILE macro to RTS_PROFILE (#780)

Author: OmniBlade

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

@@ -101,7 +101,7 @@ enum
 
 static Bool raiseMessageBoxes = TRUE;
 static Bool campaignSelected = FALSE;
-#if defined RTS_DEBUG || defined RTS_INTERNAL || defined _PROFILE
+#if defined RTS_DEBUG || defined RTS_INTERNAL || defined RTS_PROFILE
 static NameKeyType campaignID = NAMEKEY_INVALID;
 static GameWindow *buttonCampaign = NULL;
 #ifdef TEST_COMPRESSION
@@ -554,7 +554,7 @@ void MainMenuInit( WindowLayout *layout, void *userData )
 
 	showSelectiveButtons(SHOW_NONE);
 	// Set up the version number
-#if defined RTS_DEBUG || defined RTS_INTERNAL || defined _PROFILE
+#if defined RTS_DEBUG || defined RTS_INTERNAL || defined RTS_PROFILE
 	WinInstanceData instData;
 #ifdef TEST_COMPRESSION
 	instData.init();
@@ -1309,7 +1309,7 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg,
 
 			if(buttonPushed)
 				break;
-#if defined RTS_DEBUG || defined RTS_INTERNAL || defined _PROFILE
+#if defined RTS_DEBUG || defined RTS_INTERNAL || defined RTS_PROFILE
 			if( control == buttonCampaign )
 			{
 				buttonPushed = TRUE;

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp

@@ -460,7 +460,7 @@ void Shell::showShell( Bool runInit )
 
 	if (!TheGlobalData->m_shellMapOn && m_screenCount == 0)
   {
-#ifdef _PROFILE
+#ifdef RTS_PROFILE
     Profile::StopRange("init");
 #endif
 	//else

GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp

@@ -3600,11 +3600,11 @@ void GameLogic::update( void )
 		Total_Load_3D_Assets=0;
 	#endif
 
-#ifdef _PROFILE
+#ifdef RTS_PROFILE
     Profile::StartRange("map_load");
 #endif
 		startNewGame( FALSE );
-#ifdef _PROFILE
+#ifdef RTS_PROFILE
     Profile::StopRange("map_load");
 #endif
 		m_startNewGame = FALSE;

GeneralsMD/Code/Libraries/Source/debug/debug.h

@@ -38,7 +38,7 @@
   Generally speaking there are four different library variants:
   - Internal: all asserts/checks/logs, full optimizations (RTS_INTERNAL macro defined)
   - %Debug: all asserts/checks/logs, no optimizations (RTS_DEBUG macro defined)
-  - Profile: all asserts/checks/logs, full optimizations, profiling active (_PROFILE macro defined)
+  - Profile: all asserts/checks/logs, full optimizations, profiling active (RTS_PROFILE macro defined)
   - Release: no asserts/checks/logs, full optimizations
 
   These variants will be broken down into separate features which
@@ -89,7 +89,7 @@
 #endif
 
 // Define which libraries to use. 
-#if defined(RTS_INTERNAL) || defined(RTS_DEBUG) || defined(_PROFILE)
+#if defined(RTS_INTERNAL) || defined(RTS_DEBUG) || defined(RTS_PROFILE)
 #  define HAS_ASSERTS
 #  define HAS_LOGS
 #endif
@@ -98,7 +98,7 @@
 #  define HAS_OPT
 #endif
 
-#if defined(_PROFILE)
+#if defined(RTS_PROFILE)
 #  define HAS_PROFILE
 #endif
 

GeneralsMD/Code/Libraries/Source/debug/debug_debug.cpp

@@ -1441,7 +1441,7 @@ void Debug::WriteBuildInfo(void)
     operator<<(" internal");
   #elif defined(RTS_DEBUG)
     operator<<(" debug");
-  #elif defined(_PROFILE)
+  #elif defined(RTS_PROFILE)
     operator<<(" profile");
   #else
     operator<<(" release");

GeneralsMD/Code/Libraries/Source/profile/profile.cpp

@@ -197,7 +197,7 @@ void Profile::StartRange(const char *range)
 
   if (active)
   {
-#ifdef _PROFILE
+#ifdef RTS_PROFILE
     m_frameNames[k].funcIndex=ProfileFuncLevelTracer::FrameStart();
     DASSERT(m_frameNames[k].funcIndex>=0);
 #endif
@@ -248,7 +248,7 @@ void Profile::AppendRange(const char *range)
 
   if (active)
   {
-#ifdef _PROFILE
+#ifdef RTS_PROFILE
     m_frameNames[k].funcIndex=ProfileFuncLevelTracer::FrameStart();
     DASSERT(m_frameNames[k].funcIndex>=0);
 #endif
@@ -279,7 +279,7 @@ void Profile::StopRange(const char *range)
   // stop recording
   m_frameNames[k].isRecording=false;
   if (
-#ifdef _PROFILE
+#ifdef RTS_PROFILE
     m_frameNames[k].funcIndex>=0 ||
 #endif
     m_frameNames[k].highIndex>=0
@@ -298,7 +298,7 @@ void Profile::StopRange(const char *range)
     }
     else
       atIndex=m_frameNames[k].lastGlobalIndex;
-#ifdef _PROFILE
+#ifdef RTS_PROFILE
     if (m_frameNames[k].funcIndex>=0)
       ProfileFuncLevelTracer::FrameEnd(m_frameNames[k].funcIndex,atIndex);
     if (m_frameNames[k].highIndex>=0)
@@ -327,7 +327,7 @@ const char *Profile::GetFrameName(unsigned frame)
 
 void Profile::ClearTotals(void)
 {
-#ifdef _PROFILE
+#ifdef RTS_PROFILE
   ProfileFuncLevelTracer::ClearTotals();
 #endif
   ProfileId::ClearTotals();
@@ -370,7 +370,7 @@ bool Profile::SimpleMatch(const char *str, const char *pattern)
 
 static void ProfileShutdown(void)
 {
-#ifdef _PROFILE
+#ifdef RTS_PROFILE
   ProfileFuncLevelTracer::Shutdown();
 #endif
   ProfileId::Shutdown();

GeneralsMD/Code/Main/WinMain.cpp

@@ -842,7 +842,7 @@ Int APIENTRY WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
 {
 	checkProtection();
 
-#ifdef _PROFILE
+#ifdef RTS_PROFILE
   Profile::StartRange("init");
 #endif
 
@@ -928,7 +928,7 @@ Int APIENTRY WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
 
 
 // Force "splash image" to be loaded from a file, not a resource so same exe can be used in different localizations.
-#if defined RTS_DEBUG || defined RTS_INTERNAL || defined _PROFILE
+#if defined RTS_DEBUG || defined RTS_INTERNAL || defined RTS_PROFILE
 
 			// check both localized directory and root dir
 		char filePath[_MAX_PATH];

cmake/config-build.cmake

@@ -69,6 +69,6 @@ else()
         target_compile_definitions(core_config INTERFACE RTS_INTERNAL)
     endif()
     if(RTS_BUILD_OPTION_PROFILE)
-        target_compile_definitions(core_config INTERFACE _PROFILE)
+        target_compile_definitions(core_config INTERFACE RTS_PROFILE)
     endif()
 endif()