build(cmake): Move most CppMacros.h includes into precompiled headers and make them available in all build targets (TheSuperHackers#2090)

xezon · web-flow · commit 25e3602907f2 · 2026-01-11T22:19:35.000+01:00
diff --git a/Core/CMakeLists.txt b/Core/CMakeLists.txt
@@ -5,6 +5,7 @@ add_library(corei_libraries_source_wwvegas INTERFACE)
 add_library(corei_libraries_source_wwvegas_wwlib INTERFACE)
 add_library(corei_main INTERFACE)
 add_library(corei_always INTERFACE)
+add_library(corei_always_no_pch INTERFACE) # Use this for Shared Libs with MFC AFX
 
 target_include_directories(corei_gameengine_include INTERFACE "GameEngine/Include")
 target_include_directories(corei_libraries_include INTERFACE "Libraries/Include")
@@ -17,6 +18,11 @@ target_link_libraries(corei_always INTERFACE
     corei_libraries_include
     resources
 )
+target_link_libraries(corei_always_no_pch INTERFACE
+    core_utility_no_pch
+    corei_libraries_include
+    resources
+)
 
 # Set where the build results will end up
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
diff --git a/Core/GameEngine/Include/Common/Debug.h b/Core/GameEngine/Include/Common/Debug.h
@@ -45,8 +45,6 @@
 
 #pragma once
 
-#include <Utility/CppMacros.h>
-
 class AsciiString;
 
 #define NO_RELEASE_DEBUG_LOGGING
diff --git a/Core/Libraries/Include/Lib/BaseTypeCore.h b/Core/Libraries/Include/Lib/BaseTypeCore.h
@@ -33,7 +33,6 @@
 #include <string.h>
 // TheSuperHackers @build feliwir 07/04/2025 Adds utility macros for cross-platform compatibility
 #include <Utility/compat.h>
-#include <Utility/CppMacros.h>
 #include <Utility/stdint_adapter.h>
 
 /*
diff --git a/Core/Libraries/Source/Compression/CMakeLists.txt b/Core/Libraries/Source/Compression/CMakeLists.txt
@@ -30,8 +30,8 @@ target_include_directories(core_compression INTERFACE
 
 target_link_libraries(core_compression PRIVATE
     core_config
-    core_utility
     corei_libraries_include
+    corei_always
 )
 
 
diff --git a/Core/Libraries/Source/WWVegas/WWLib/CMakeLists.txt b/Core/Libraries/Source/WWVegas/WWLib/CMakeLists.txt
@@ -176,6 +176,7 @@ target_include_directories(core_wwlib PUBLIC
 )
 
 target_precompile_headers(core_wwlib PRIVATE
+    [["Utility/CppMacros.h"]] # Must be first, to be removed when abandoning VC6
     always.h
     STLUtils.h
     win.h
diff --git a/Core/Libraries/Source/WWVegas/WWLib/STLUtils.h b/Core/Libraries/Source/WWVegas/WWLib/STLUtils.h
@@ -22,7 +22,6 @@
 #include <cstddef>
 #include <map>
 #include <utility>
-#include <Utility/CppMacros.h>
 
 namespace stl
 {
diff --git a/Core/Libraries/Source/WWVegas/WWMath/CMakeLists.txt b/Core/Libraries/Source/WWVegas/WWMath/CMakeLists.txt
@@ -87,6 +87,7 @@ target_sources(core_wwmath PRIVATE ${WWMATH_SRC})
 
 target_link_libraries(core_wwmath PRIVATE
     core_wwcommon
+    corei_always
 )
 
 # @todo Test its impact and see what to do with the legacy functions.
diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/CMakeLists.txt b/Core/Libraries/Source/WWVegas/WWSaveLoad/CMakeLists.txt
@@ -42,4 +42,5 @@ target_sources(core_wwsaveload PRIVATE ${WWSAVELOAD_SRC})
 
 target_link_libraries(core_wwsaveload PRIVATE
     core_wwcommon
+    corei_always
 )
diff --git a/Core/Libraries/Source/debug/CMakeLists.txt b/Core/Libraries/Source/debug/CMakeLists.txt
@@ -30,6 +30,7 @@ target_include_directories(core_debug INTERFACE
 )
 
 target_precompile_headers(core_debug PRIVATE
+    [["Utility/CppMacros.h"]] # Must be first, to be removed when abandoning VC6
     "debug.h"
     "internal.h"
     "internal_except.h"
diff --git a/Core/Libraries/Source/profile/CMakeLists.txt b/Core/Libraries/Source/profile/CMakeLists.txt
@@ -25,6 +25,7 @@ target_include_directories(core_profile INTERFACE
 )
 
 target_precompile_headers(core_profile PRIVATE
+    [["Utility/CppMacros.h"]] # Must be first, to be removed when abandoning VC6
     "profile.h"
     "internal.h"
     <windows.h>
diff --git a/Core/Libraries/Source/profile/internal.h b/Core/Libraries/Source/profile/internal.h
@@ -34,7 +34,6 @@
 #include "internal_highlevel.h"
 #include "internal_cmd.h"
 #include "internal_result.h"
-#include "Utility/CppMacros.h"
 #include <windows.h>
 
 #if !(defined(_MSC_VER) && _MSC_VER < 1300)
diff --git a/Core/Tools/Babylon/CMakeLists.txt b/Core/Tools/Babylon/CMakeLists.txt
@@ -58,6 +58,7 @@ target_sources(core_babylon PRIVATE ${BABYLON_SRC})
 
 target_link_libraries(core_babylon PRIVATE
     core_config
+    corei_always
 )
 
 if(WIN32 OR "${CMAKE_SYSTEM}" MATCHES "Windows")
diff --git a/Core/Tools/CRCDiff/CMakeLists.txt b/Core/Tools/CRCDiff/CMakeLists.txt
@@ -17,6 +17,7 @@ target_sources(core_crcdiff PRIVATE ${CRCDIFF_SRC})
 target_link_libraries(core_crcdiff PRIVATE
     core_config
     core_utility
+    corei_always
     stlport
 )
 
diff --git a/Core/Tools/DebugWindow/CMakeLists.txt b/Core/Tools/DebugWindow/CMakeLists.txt
@@ -14,6 +14,7 @@ target_sources(core_debugwindow PRIVATE ${DEBUGWINDOW_SRC})
 
 target_link_libraries(core_debugwindow PRIVATE
     core_config
+    corei_always_no_pch
 )
 
 if(WIN32 OR "${CMAKE_SYSTEM}" MATCHES "Windows")
diff --git a/Core/Tools/DebugWindow/StdAfx.h b/Core/Tools/DebugWindow/StdAfx.h
@@ -56,3 +56,5 @@
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
+
+#include <Utility/CppMacros.h>
diff --git a/Core/Tools/W3DView/CMakeLists.txt b/Core/Tools/W3DView/CMakeLists.txt
@@ -171,6 +171,7 @@ add_library(corei_w3dview INTERFACE)
 target_sources(corei_w3dview INTERFACE ${W3DVIEW_SRC})
 
 target_precompile_headers(corei_w3dview INTERFACE
+    [["Utility/CppMacros.h"]] # Must be first, to be removed when abandoning VC6
     "StdAfx.h"
     [["always.h"]]
     [["STLUtils.h"]]
diff --git a/Core/Tools/WW3D/max2w3d/util.h b/Core/Tools/WW3D/max2w3d/util.h
@@ -99,14 +99,14 @@ INode *Find_Named_Node (char *nodename, INode *root);
 /*
 ** Macros
 */
-#define SAFE_DELETE(pobject)					\
-			if (pobject) {							\
-				delete pobject;					\
-				pobject = NULL;					\
-			}											\
-
-#define SAFE_DELETE_ARRAY(pobject)			\
-			if (pobject) {							\
-				delete [] pobject;				\
-				pobject = NULL;					\
-			}											\
+#define SAFE_DELETE(pobject) \
+			if (pobject) { \
+				delete pobject; \
+				pobject = NULL; \
+			}
+
+#define SAFE_DELETE_ARRAY(pobject) \
+			if (pobject) { \
+				delete [] pobject; \
+				pobject = NULL; \
+			}
diff --git a/Core/Tools/WW3D/pluglib/CMakeLists.txt b/Core/Tools/WW3D/pluglib/CMakeLists.txt
@@ -59,7 +59,7 @@ set_target_properties(core_pluglib PROPERTIES OUTPUT_NAME pluglib)
 target_sources(core_pluglib PRIVATE ${PLUGLIB_SRC})
 
 target_link_libraries(core_pluglib PUBLIC
-    core_utility
+    corei_always
 )
 
 target_link_libraries(core_pluglib PRIVATE
diff --git a/Core/Tools/assetcull/CMakeLists.txt b/Core/Tools/assetcull/CMakeLists.txt
@@ -9,6 +9,7 @@ target_sources(core_assetcull PRIVATE ${ASSETCULL_SRC})
 
 target_link_libraries(core_assetcull PRIVATE
     core_config
+    corei_always
 )
 
 if(WIN32 OR "${CMAKE_SYSTEM}" MATCHES "Windows")
diff --git a/Core/Tools/buildVersionUpdate/CMakeLists.txt b/Core/Tools/buildVersionUpdate/CMakeLists.txt
@@ -10,4 +10,5 @@ target_sources(core_buildversionupdate PRIVATE ${BUILDVERSIONUPDATE_SRC})
 target_link_libraries(core_buildversionupdate PRIVATE
     core_config
     core_wwlib
+    corei_always
 )
diff --git a/Core/Tools/mangler/CMakeLists.txt b/Core/Tools/mangler/CMakeLists.txt
@@ -68,7 +68,7 @@ target_include_directories(core_manglerlib PRIVATE
 target_link_libraries(core_manglerlib PRIVATE wsock32)
 target_link_libraries(core_manglerlib PUBLIC
     core_config
-    core_utility
+    corei_always
 )
 
 # mangler app
diff --git a/Core/Tools/matchbot/CMakeLists.txt b/Core/Tools/matchbot/CMakeLists.txt
@@ -73,7 +73,7 @@ target_include_directories(core_matchbot PRIVATE
 target_link_libraries(core_matchbot PRIVATE
     gamespy::gamespy
     core_config
-    core_utility
+    corei_always
     stlport
 )
 
diff --git a/Core/Tools/textureCompress/CMakeLists.txt b/Core/Tools/textureCompress/CMakeLists.txt
@@ -10,8 +10,8 @@ target_sources(core_texturecompress PRIVATE ${TEXTURECOMPRESS_SRC})
 
 target_link_libraries(core_texturecompress PRIVATE
     core_config
-    core_utility
     core_wwlib
+    corei_always
 )
 
 if(WIN32 OR "${CMAKE_SYSTEM}" MATCHES "Windows")
diff --git a/Core/Tools/timingTest/CMakeLists.txt b/Core/Tools/timingTest/CMakeLists.txt
@@ -11,7 +11,7 @@ target_sources(core_timingtest PRIVATE ${TIMINGTEST_SRC})
 
 target_link_libraries(core_timingtest PRIVATE
     core_config
-    core_utility
+    corei_always
     winmm
 )
 
diff --git a/Core/Tools/versionUpdate/CMakeLists.txt b/Core/Tools/versionUpdate/CMakeLists.txt
@@ -10,4 +10,5 @@ target_sources(core_versionupdate PRIVATE ${VERSIONUPDATE_SRC})
 target_link_libraries(core_versionupdate PRIVATE
     core_config
     core_wwlib
+    corei_always
 )
diff --git a/Core/Tools/wolSetup/CMakeLists.txt b/Core/Tools/wolSetup/CMakeLists.txt
@@ -22,6 +22,7 @@ target_sources(core_wolsetup PRIVATE ${WOLSETUP_SRC})
 
 target_link_libraries(core_wolsetup PRIVATE
     core_config
+    corei_always
     Version
 )
 
diff --git a/Dependencies/Utility/CMakeLists.txt b/Dependencies/Utility/CMakeLists.txt
@@ -1,3 +1,8 @@
 add_library(core_utility INTERFACE)
+target_include_directories(core_utility INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
+target_precompile_headers(core_utility INTERFACE
+    [["Utility/CppMacros.h"]] # Must be first, to be removed when abandoning VC6
+)
 
-target_include_directories(core_utility INTERFACE ".")
+add_library(core_utility_no_pch INTERFACE)
+target_include_directories(core_utility_no_pch INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/Dependencies/Utility/Utility/CppMacros.h b/Dependencies/Utility/Utility/CppMacros.h
@@ -17,38 +17,41 @@
 */
 
 // This file contains macros to help upgrade the code for newer cpp standards.
+// Must be C compliant
+
 #pragma once
 
 #if __cplusplus >= 201103L
 #include <utility>
 #endif
 
+#if __cplusplus >= 201103L
+#define CPP_11(code) code
+#else
+#define CPP_11(code)
+#define static_assert(expr, msg)
+#define constexpr
+#define nullptr 0
+#endif
+
 #if __cplusplus >= 201703L
-#define NOEXCEPT_17 noexcept
+#define NOEXCEPT noexcept
 #define REGISTER
 #define FALLTHROUGH [[fallthrough]]
 #else
-#define NOEXCEPT_17
+#define NOEXCEPT
 #define REGISTER register
 #define FALLTHROUGH
 #endif
 
 // noexcept for methods of IUNKNOWN interface
 #if defined(_MSC_VER)
-#define IUNKNOWN_NOEXCEPT NOEXCEPT_17
+#define IUNKNOWN_NOEXCEPT NOEXCEPT
 #else
 #define IUNKNOWN_NOEXCEPT
 #endif
 
-#if __cplusplus >= 201103L
-#define CPP_11(code) code
-#else
-#define CPP_11(code)
-#define static_assert(expr, msg)
-#define constexpr
-#define nullptr 0
-#endif
-
+#ifdef __cplusplus
 namespace stl
 {
 
@@ -68,3 +71,4 @@ inline void move_or_swap(T& dest, T& src)
 }
 
 } // namespace stl
+#endif
diff --git a/Dependencies/Utility/Utility/endian_compat.h b/Dependencies/Utility/Utility/endian_compat.h
@@ -22,7 +22,6 @@
 #ifndef ENDIAN_COMPAT_H
 #define ENDIAN_COMPAT_H
 
-#include <Utility/CppMacros.h>
 #include <Utility/stdint_adapter.h>
 
 
diff --git a/Generals/Code/CMakeLists.txt b/Generals/Code/CMakeLists.txt
@@ -4,6 +4,7 @@ add_library(gi_libraries_include INTERFACE)
 add_library(gi_libraries_source_wwvegas INTERFACE)
 add_library(gi_main INTERFACE)
 add_library(gi_always INTERFACE)
+add_library(gi_always_no_pch INTERFACE) # Use this for Shared Libs with MFC AFX
 
 target_include_directories(gi_gameengine_include INTERFACE "GameEngine/Include")
 target_link_libraries(gi_gameengine_include INTERFACE corei_gameengine_include)
@@ -14,11 +15,16 @@ target_include_directories(gi_main INTERFACE "Main")
 target_compile_definitions(gi_always INTERFACE
     RTS_GENERALS=1
 )
+target_compile_definitions(gi_always_no_pch INTERFACE
+    RTS_GENERALS=1
+)
 target_link_libraries(gi_always INTERFACE
-    core_utility
     gi_libraries_include
-    # Must stay below so headers from game are included first
-    corei_libraries_include
+    corei_always # Must stay below so headers from game are included first
+)
+target_link_libraries(gi_always_no_pch INTERFACE
+    gi_libraries_include
+    corei_always_no_pch # Must stay below so headers from game are included first
 )
 
 # Contains internal libraries
diff --git a/Generals/Code/GameEngine/CMakeLists.txt b/Generals/Code/GameEngine/CMakeLists.txt
@@ -1096,4 +1096,7 @@ target_link_libraries(g_gameengine PUBLIC
     g_wwvegas
 )
 
-target_precompile_headers(g_gameengine PRIVATE Include/Precompiled/PreRTS.h)
+target_precompile_headers(g_gameengine PRIVATE
+    [["Utility/CppMacros.h"]] # Must be first, to be removed when abandoning VC6
+    Include/Precompiled/PreRTS.h
+)
diff --git a/Generals/Code/GameEngineDevice/CMakeLists.txt b/Generals/Code/GameEngineDevice/CMakeLists.txt
@@ -190,6 +190,7 @@ target_include_directories(g_gameenginedevice PUBLIC
 )
 
 target_precompile_headers(g_gameenginedevice PRIVATE
+    [["Utility/CppMacros.h"]] # Must be first, to be removed when abandoning VC6
     [["Common/STLTypedefs.h"]]
     [["Common/SubsystemInterface.h"]]
     [["INI.h"]]
@@ -199,8 +200,8 @@ target_precompile_headers(g_gameenginedevice PRIVATE
 
 target_link_libraries(g_gameenginedevice PRIVATE
     corei_gameenginedevice_private
-    gi_always    
-    gi_main  
+    gi_always
+    gi_main
 )
 
 target_link_libraries(g_gameenginedevice PUBLIC
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt b/Generals/Code/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt
@@ -238,6 +238,7 @@ target_compile_definitions(g_ww3d2 PRIVATE
 )
 
 target_precompile_headers(g_ww3d2 PRIVATE
+    [["Utility/CppMacros.h"]] # Must be first, to be removed when abandoning VC6
     dx8wrapper.h
     [["always.h"]]
     [["STLUtils.h"]]
@@ -250,4 +251,5 @@ target_precompile_headers(g_ww3d2 PRIVATE
 target_link_libraries(g_ww3d2 PRIVATE
     corei_ww3d2
     g_wwcommon
+    gi_always
 )
diff --git a/Generals/Code/Libraries/Source/WWVegas/WWAudio/CMakeLists.txt b/Generals/Code/Libraries/Source/WWVegas/WWAudio/CMakeLists.txt
@@ -4,4 +4,5 @@ set_target_properties(g_wwaudio PROPERTIES OUTPUT_NAME wwaudio)
 target_link_libraries(g_wwaudio PRIVATE
     corei_wwaudio
     g_wwcommon
+    gi_always
 )
diff --git a/Generals/Code/Tools/ParticleEditor/CMakeLists.txt b/Generals/Code/Tools/ParticleEditor/CMakeLists.txt
diff --git a/Generals/Code/Tools/ParticleEditor/StdAfx.h b/Generals/Code/Tools/ParticleEditor/StdAfx.h
diff --git a/Generals/Code/Tools/W3DView/CMakeLists.txt b/Generals/Code/Tools/W3DView/CMakeLists.txt
diff --git a/Generals/Code/Tools/WorldBuilder/CMakeLists.txt b/Generals/Code/Tools/WorldBuilder/CMakeLists.txt
diff --git a/GeneralsMD/Code/CMakeLists.txt b/GeneralsMD/Code/CMakeLists.txt
diff --git a/GeneralsMD/Code/GameEngine/CMakeLists.txt b/GeneralsMD/Code/GameEngine/CMakeLists.txt
diff --git a/GeneralsMD/Code/GameEngineDevice/CMakeLists.txt b/GeneralsMD/Code/GameEngineDevice/CMakeLists.txt
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WWAudio/CMakeLists.txt b/GeneralsMD/Code/Libraries/Source/WWVegas/WWAudio/CMakeLists.txt
diff --git a/GeneralsMD/Code/Tools/ParticleEditor/CMakeLists.txt b/GeneralsMD/Code/Tools/ParticleEditor/CMakeLists.txt
diff --git a/GeneralsMD/Code/Tools/ParticleEditor/StdAfx.h b/GeneralsMD/Code/Tools/ParticleEditor/StdAfx.h
diff --git a/GeneralsMD/Code/Tools/W3DView/CMakeLists.txt b/GeneralsMD/Code/Tools/W3DView/CMakeLists.txt
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/CMakeLists.txt b/GeneralsMD/Code/Tools/WorldBuilder/CMakeLists.txt
diff --git a/GeneralsMD/Code/Tools/wdump/CMakeLists.txt b/GeneralsMD/Code/Tools/wdump/CMakeLists.txt

Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,8 @@ target_include_directories(core_compression INTERFACE`
`30`	`30`
`31`	`31`	`target_link_libraries(core_compression PRIVATE`
`32`	`32`	`core_config`
`33`		`- core_utility`
`34`	`33`	`corei_libraries_include`
	`34`	`+ corei_always`
`35`	`35`	`)`
`36`	`36`
`37`	`37`
Original file line number	Diff line number	Diff line change
`@@ -176,6 +176,7 @@ target_include_directories(core_wwlib PUBLIC`
`176`	`176`	`)`
`177`	`177`
`178`	`178`	`target_precompile_headers(core_wwlib PRIVATE`
	`179`	`+ [["Utility/CppMacros.h"]] # Must be first, to be removed when abandoning VC6`
`179`	`180`	`always.h`
`180`	`181`	`STLUtils.h`
`181`	`182`	`win.h`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,6 @@`
`22`	`22`	`#include <cstddef>`
`23`	`23`	`#include <map>`
`24`	`24`	`#include <utility>`
`25`		`-#include <Utility/CppMacros.h>`
`26`	`25`
`27`	`26`	`namespace stl`
`28`	`27`	`{`
Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,7 @@ target_sources(core_wwmath PRIVATE ${WWMATH_SRC})`
`87`	`87`
`88`	`88`	`target_link_libraries(core_wwmath PRIVATE`
`89`	`89`	`core_wwcommon`
	`90`	`+ corei_always`
`90`	`91`	`)`
`91`	`92`
`92`	`93`	`# @todo Test its impact and see what to do with the legacy functions.`
Original file line number	Diff line number	Diff line change
`@@ -42,4 +42,5 @@ target_sources(core_wwsaveload PRIVATE ${WWSAVELOAD_SRC})`
`42`	`42`
`43`	`43`	`target_link_libraries(core_wwsaveload PRIVATE`
`44`	`44`	`core_wwcommon`
	`45`	`+ corei_always`
`45`	`46`	`)`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ target_include_directories(core_debug INTERFACE`
`30`	`30`	`)`
`31`	`31`
`32`	`32`	`target_precompile_headers(core_debug PRIVATE`
	`33`	`+ [["Utility/CppMacros.h"]] # Must be first, to be removed when abandoning VC6`
`33`	`34`	`"debug.h"`
`34`	`35`	`"internal.h"`
`35`	`36`	`"internal_except.h"`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ target_include_directories(core_profile INTERFACE`
`25`	`25`	`)`
`26`	`26`
`27`	`27`	`target_precompile_headers(core_profile PRIVATE`
	`28`	`+ [["Utility/CppMacros.h"]] # Must be first, to be removed when abandoning VC6`
`28`	`29`	`"profile.h"`
`29`	`30`	`"internal.h"`
`30`	`31`	`<windows.h>`