TheSuperHackers · xezon · Jul 7, 2025 · Jul 5, 2025 · Jul 5, 2025 · Jul 5, 2025
diff --git a/CMakePresets.json b/CMakePresets.json
@@ -34,14 +34,6 @@
                 "RTS_BUILD_OPTION_PROFILE": "ON"
             }
         },
-        {
-            "name": "vc6-internal",
-            "displayName": "Windows 32bit VC6 Internal",
-            "inherits": "vc6",
-            "cacheVariables": {
-                "RTS_BUILD_OPTION_INTERNAL": "ON"
-            }
-        },
         {
             "name": "vc6-debug",
             "displayName": "Windows 32bit VC6 Debug",
@@ -103,14 +95,6 @@
                 "RTS_BUILD_OPTION_PROFILE": "ON"
             }
         },
-        {
-            "name": "win32-internal",
-            "inherits": "win32",
-            "displayName": "Windows 32bit Internal",
-            "cacheVariables": {
-                "RTS_BUILD_OPTION_INTERNAL": "ON"
-            }
-        },
         {
             "name": "win32-debug",
             "inherits": "win32",
@@ -145,14 +129,6 @@
                 "RTS_BUILD_OPTION_PROFILE": "ON"
             }
         },
-        {
-            "name": "win32-vcpkg-internal",
-            "inherits": "win32-vcpkg",
-            "displayName": "Windows 32bit VCPKG Internal",
-            "cacheVariables": {
-                "RTS_BUILD_OPTION_INTERNAL": "ON"
-            }
-        },
         {
             "name": "win32-vcpkg-debug",
             "inherits": "win32-vcpkg",
@@ -175,12 +151,6 @@
             "displayName": "Build Windows 32bit VC6 Release",
             "description": "Build Windows 32bit VC6 Release"
         },
-        {
-            "name": "vc6-internal",
-            "configurePreset": "vc6-internal",
-            "displayName": "Build Windows 32bit VC6 Internal",
-            "description": "Build Windows 32bit VC6 Internal"
-        },
         {
             "name": "vc6-profile",
             "configurePreset": "vc6-profile",
@@ -200,13 +170,6 @@
             "description": "Build Windows 32bit Release",
             "configuration": "Release"
         },
-        {
-            "name": "win32-internal",
-            "configurePreset": "win32-internal",
-            "displayName": "Build Windows 32bit Internal",
-            "description": "Build Windows 32bit Internal",
-            "configuration": "Release"
-        },
         {
             "name": "win32-profile",
             "configurePreset": "win32-profile",
@@ -228,13 +191,6 @@
             "description": "Build Windows 32bit VCPKG Release",
             "configuration": "Release"
         },
-        {
-            "name": "win32-vcpkg-internal",
-            "configurePreset": "win32-vcpkg-internal",
-            "displayName": "Build Windows 32bit VCPKG Internal",
-            "description": "Build Windows 32bit VCPKG Internal",
-            "configuration": "Release"
-        },
         {
             "name": "win32-vcpkg-profile",
             "configurePreset": "win32-vcpkg-profile",
@@ -284,19 +240,6 @@
                 }
             ]
         },
-        {
-            "name": "vc6-internal",
-            "steps": [
-                {
-                    "type": "configure",
-                    "name": "vc6-internal"
-                },
-                {
-                    "type": "build",
-                    "name": "vc6-internal"
-                }
-            ]
-        },
         {
             "name": "vc6-profile",
             "steps": [
@@ -323,19 +266,6 @@
                 }
             ]
         },
-        {
-            "name": "win32-internal",
-            "steps": [
-                {
-                    "type": "configure",
-                    "name": "win32-internal"
-                },
-                {
-                    "type": "build",
-                    "name": "win32-internal"
-                }
-            ]
-        },
         {
             "name": "win32-profile",
             "steps": [
@@ -375,19 +305,6 @@
                 }
             ]
         },
-        {
-            "name": "win32-vcpkg-internal",
-            "steps": [
-                {
-                    "type": "configure",
-                    "name": "win32-vcpkg-internal"
-                },
-                {
-                    "type": "build",
-                    "name": "win32-vcpkg-internal"
-                }
-            ]
-        },
         {
             "name": "win32-vcpkg-profile",
             "steps": [

diff --git a/Core/GameEngine/Source/Common/System/Xfer.cpp b/Core/GameEngine/Source/Common/System/Xfer.cpp
@@ -36,11 +36,6 @@
 #include "Common/Xfer.h"
 #include "Common/BitFlagsIO.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------

diff --git a/Core/Libraries/Source/Compression/CompressionManager.cpp b/Core/Libraries/Source/Compression/CompressionManager.cpp
@@ -32,11 +32,6 @@
 #include "EAC/huffcodex.h"
 #include "EAC/refcodex.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma message("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // TheSuperHackers @todo Recover debug logging in this file?
 #define DEBUG_LOG(x) {}

diff --git a/Core/Libraries/Source/Compression/LZHCompress/NoxCompress.cpp b/Core/Libraries/Source/Compression/LZHCompress/NoxCompress.cpp
@@ -26,11 +26,6 @@
 #include "NoxCompress.h"
 #include "CompLibHeader/lzhl.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma message("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 #define BLOCKSIZE 500000
 #define NoxRead fread

diff --git a/Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.cpp b/Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.cpp
@@ -41,11 +41,6 @@
 #include "wwmemlog.h"
 #include "dx8wrapper.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma message("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 ////////////////////////////////////////////////////////////////////////////////////
 //	Local constants

diff --git a/Core/Libraries/Source/WWVegas/WW3D2/rendobj.cpp b/Core/Libraries/Source/WWVegas/WW3D2/rendobj.cpp
@@ -93,11 +93,6 @@
 #include "intersec.h"
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off) 
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // Definitions of static members:
 const float	RenderObjClass::AT_MIN_LOD = FLT_MAX;

diff --git a/Core/Libraries/Source/WWVegas/WW3D2/seglinerenderer.cpp b/Core/Libraries/Source/WWVegas/WW3D2/seglinerenderer.cpp
@@ -60,11 +60,6 @@
 #define SEGLINE_CHUNK_SIZE (128)
 #endif
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 #define MAX_SEGLINE_POINT_BUFFER_SIZE (1 + SEGLINE_CHUNK_SIZE)
 // This macro depends on the assumption that each line segment is two polys.

diff --git a/Core/Libraries/Source/WWVegas/WW3D2/streakRender.cpp b/Core/Libraries/Source/WWVegas/WW3D2/streakRender.cpp
@@ -35,11 +35,6 @@
 #include "RANDOM.H"
 #include "v3_rnd.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-// #pragma optimize("", off)
-// #pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 /* We have chunking logic which handles N segments at a time. To simplify the subdivision logic,
 ** we will ensure that N is a power of two and that N >= 2^MAX_STREAK_SUBDIV_LEVELS, so that the
@@ -1414,7 +1409,7 @@ VertexFormatXYZUV1 *StreakRendererClass::getVertexBuffer(unsigned int number)
 		m_vertexBufferSize = numberToAlloc;
 	}
 
-#ifdef RTS_INTERNAL
+#ifdef RTS_DEBUG
 	for (unsigned i = 0; i < number; ++i)
 	{
 	  m_vertexBuffer[i].x = m_vertexBuffer[i].y = m_vertexBuffer[i].z = m_vertexBuffer[i].u1 = m_vertexBuffer[i].v1 = (float)0xdeadbeef;

diff --git a/Core/Libraries/Source/WWVegas/WWLib/always.h b/Core/Libraries/Source/WWVegas/WWLib/always.h
@@ -106,7 +106,7 @@
 
 #endif
 
-#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) 
+#if defined(RTS_DEBUG) 
 	#define MSGW3DNEW(MSG)					new( MSG, 0 )
 	#define MSGW3DNEWARRAY(MSG)			new( MSG, 0 )
 	#define W3DNEW									new("W3D_" __FILE__, 0)

diff --git a/Core/Libraries/Source/WWVegas/WWLib/sharebuf.h b/Core/Libraries/Source/WWVegas/WWLib/sharebuf.h
@@ -77,7 +77,7 @@ class ShareBufferClass : public W3DMPO, public RefCountClass
 
 	protected:
 
-#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) 
+#if defined(RTS_DEBUG) 
 		const char* Msg;
 #endif
 		T *			Array;
@@ -90,7 +90,7 @@ class ShareBufferClass : public W3DMPO, public RefCountClass
 template <class T>
 ShareBufferClass<T>::ShareBufferClass(int count, const char* msg) :
 	Count(count)
-#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) 
+#if defined(RTS_DEBUG) 
 	, Msg(msg)
 #endif
 {
@@ -103,7 +103,7 @@ ShareBufferClass<T>::ShareBufferClass(const ShareBufferClass<T> & that) :
 	Count(that.Count)
 {
 	assert(Count > 0);
-#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) 
+#if defined(RTS_DEBUG) 
 	Msg = that.Msg;
 #endif
 	Array = MSGW3DNEWARRAY(Msg) T[Count];

diff --git a/Core/Libraries/Source/debug/debug.h b/Core/Libraries/Source/debug/debug.h
@@ -35,8 +35,7 @@
 /** 
   \page lib_var Library variants
 
-  Generally speaking there are four different library variants:
-  - Internal: all asserts/checks/logs, full optimizations (RTS_INTERNAL macro defined)
+  Generally speaking there are three different library variants:
   - %Debug: all asserts/checks/logs, no optimizations (RTS_DEBUG macro defined)
   - Profile: all asserts/checks/logs, full optimizations, profiling active (RTS_PROFILE macro defined)
   - Release: no asserts/checks/logs, full optimizations
@@ -84,12 +83,8 @@
   - Release: XXX.lib
 */
 
-#if defined(RTS_DEBUG) && defined(RTS_INTERNAL)
-	#error "Only either RTS_DEBUG or RTS_INTERNAL should ever be defined"
-#endif
-
 // Define which libraries to use. 
-#if defined(RTS_INTERNAL) || defined(RTS_DEBUG) || defined(RTS_PROFILE)
+#if defined(RTS_DEBUG) || defined(RTS_PROFILE)
 #  define HAS_ASSERTS
 #  define HAS_LOGS
 #endif

diff --git a/Core/Libraries/Source/debug/debug_debug.cpp b/Core/Libraries/Source/debug/debug_debug.cpp
@@ -1437,9 +1437,7 @@ void Debug::WriteBuildInfo(void)
     (*this) << " " << m_version;
   if (*m_intVersion)
     (*this) << " internal " << m_intVersion;
-  #if defined(RTS_INTERNAL)
-    operator<<(" internal");
-  #elif defined(RTS_DEBUG)
+  #if defined(RTS_DEBUG)
     operator<<(" debug");
   #elif defined(RTS_PROFILE)
     operator<<(" profile");

diff --git a/Core/Libraries/Source/debug/debug_macro.h b/Core/Libraries/Source/debug/debug_macro.h
@@ -45,7 +45,7 @@
   This module defines a number of macros. Usually only these macros should be
   used to access any debug functionality.
 
-  All these macros are defined if either RTS_DEBUG or RTS_INTERNAL is defined. Otherwise
+  All these macros are defined if RTS_DEBUG is defined. Otherwise
   all of them (with the exception of DCHECK and DCHECK_MSG) will be removed.
 */
 ///@{
@@ -57,7 +57,7 @@
     returns false. The user will then have the choice of aborting the program,
     continuing once or continuing with completely ignoring that specific assertion.
 
-    Assertions are completely removed if neither RTS_DEBUG nor RTS_INTERNAL are defined.
+    Assertions are completely removed if RTS_DEBUG is not defined.
 
     \param expr expression, trigger assert window if false
   */
@@ -73,7 +73,7 @@
     \endcode
     For more information see the \ref debug_stream page.
 
-    Assertions are completely removed if neither RTS_DEBUG nor RTS_INTERNAL are defined.
+    Assertions are completely removed if RTS_DEBUG is not defined.
 
     \param expr expression, trigger assert window if false
     \param msg custom message stream, see \ref debug_stream
@@ -282,7 +282,7 @@ DFAIL_IF_MSG(!ptrval,"pointer must not be NULL") return;
 
 ///@}
 
-#elif defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#elif defined(RTS_DEBUG)
 
   #define DASSERT(expr) \
     ((void)( Debug::SkipNext() || \

diff --git a/Core/Libraries/Source/profile/profile.h b/Core/Libraries/Source/profile/profile.h
@@ -32,10 +32,6 @@
 #ifndef PROFILE_H // Include guard
 #define PROFILE_H
 
-#if defined(RTS_DEBUG) && defined(RTS_INTERNAL)
-	#error "Only either RTS_DEBUG or RTS_INTERNAL should ever be defined"
-#endif
-
 // include all our public header files (use double quotes here)
 #include "profile_doc.h"
 #include "profile_highlevel.h"

diff --git a/Core/Tools/MapCacheBuilder/Source/WinMain.cpp b/Core/Tools/MapCacheBuilder/Source/WinMain.cpp
@@ -110,11 +110,6 @@
 
 // PRIVATE TYPES //////////////////////////////////////////////////////////////
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma message("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // PRIVATE DATA ///////////////////////////////////////////////////////////////
 

diff --git a/Generals/Code/GameEngine/Include/Common/AsciiString.h b/Generals/Code/GameEngine/Include/Common/AsciiString.h
@@ -89,7 +89,7 @@ class AsciiString
 	// add a ctor/dtor, 'cuz they won't ever be called.
 	struct AsciiStringData
 	{
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 		const char* m_debugptr;	// just makes it easier to read in the debugger
 #endif
 		unsigned short	m_refCount;						// reference count