Add RTS_DEBUG_INCLUDE_DEBUG_LOG_IN_CRC_LOG option (again)

Author: helmutbuhler

GeneralsMD/Code/GameEngine/Source/Common/System/Debug.cpp

@@ -52,7 +52,7 @@
 // Uncomment this to show normal logging stuff in the crc logging.
 // This can be helpful for context, but can also clutter diffs because normal logs arn't necessarily
 // deterministic or the same on all peers in multiplayer games.
-//#define NORMAL_LOG_IN_CRC_LOG
+//#define INCLUDE_DEBUG_LOG_IN_CRC_LOG
 
 #define DEBUG_THREADSAFE
 #ifdef DEBUG_THREADSAFE
@@ -246,7 +246,7 @@ static void doLogOutput(const char *buffer)
 		::OutputDebugString(buffer);
 	}
 
-#ifdef NORMAL_LOG_IN_CRC_LOG
+#ifdef INCLUDE_DEBUG_LOG_IN_CRC_LOG
 	addCRCDebugLineNoCounter("%s", buffer);
 #endif
 }

cmake/config-debug.cmake

@@ -10,12 +10,14 @@ set_property(CACHE RTS_DEBUG_STACKTRACE PROPERTY STRINGS DEFAULT ON OFF)
 set(RTS_DEBUG_PROFILE "DEFAULT" CACHE STRING "Enables debug profiling. When DEFAULT, this option is enabled with DEBUG or INTERNAL")
 set_property(CACHE RTS_DEBUG_PROFILE PROPERTY STRINGS DEFAULT ON OFF)
 
+option(RTS_DEBUG_INCLUDE_DEBUG_LOG_IN_CRC_LOG "Include normal debug log in crc log" OFF)
 
 
 add_feature_info(DebugLogging                 RTS_DEBUG_LOGGING                      "Build with Debug Logging")
 add_feature_info(DebugCrashing                RTS_DEBUG_CRASHING                     "Build with Debug Crashing")
 add_feature_info(DebugStacktrace              RTS_DEBUG_STACKTRACE                   "Build with Debug Stacktracing")
 add_feature_info(DebugProfile                 RTS_DEBUG_PROFILE                      "Build with Debug Profiling")
+add_feature_info(DebugIncludeDebugLogInCrcLog RTS_DEBUG_INCLUDE_DEBUG_LOG_IN_CRC_LOG "Include debug logs in crc logs")
 
 
 # Helper macro that handles DEFAULT ON OFF options
@@ -36,3 +38,7 @@ define_debug_option(RTS_DEBUG_LOGGING    DEBUG_LOGGING    DISABLE_DEBUG_LOGGING
 define_debug_option(RTS_DEBUG_CRASHING   DEBUG_CRASHING   DISABLE_DEBUG_CRASHING  )
 define_debug_option(RTS_DEBUG_STACKTRACE DEBUG_STACKTRACE DISABLE_DEBUG_STACKTRACE)
 define_debug_option(RTS_DEBUG_PROFILE    DEBUG_PROFILE    DISABLE_DEBUG_PROFILE   )
+
+if(RTS_DEBUG_INCLUDE_DEBUG_LOG_IN_CRC_LOG)
+    target_compile_definitions(core_config INTERFACE INCLUDE_DEBUG_LOG_IN_CRC_LOG)
+endif()