diff --git a/Core/GameEngine/CMakeLists.txt b/Core/GameEngine/CMakeLists.txt index 18ef14be1bd..b08c1d6e473 100644 --- a/Core/GameEngine/CMakeLists.txt +++ b/Core/GameEngine/CMakeLists.txt @@ -556,7 +556,7 @@ set(GAMEENGINE_SRC Include/GameNetwork/User.h Include/GameNetwork/WOLBrowser/FEBDispatch.h Include/GameNetwork/WOLBrowser/WebBrowser.h -# Include/Precompiled/PreRTS.h + Include/Precompiled/PreRTS.h Source/Common/AddonCompat.cpp Source/Common/Audio/AudioEventRTS.cpp Source/Common/Audio/AudioRequest.cpp @@ -1146,7 +1146,7 @@ set(GAMEENGINE_SRC Source/GameNetwork/udp.cpp Source/GameNetwork/User.cpp Source/GameNetwork/WOLBrowser/WebBrowser.cpp -# Source/Precompiled/PreRTS.cpp + Source/Precompiled/PreRTS.cpp ) if(RTS_GAMEMEMORY_ENABLE) @@ -1174,7 +1174,7 @@ add_library(corei_gameengine_public INTERFACE) target_sources(corei_gameengine_private INTERFACE ${GAMEENGINE_SRC}) target_include_directories(corei_gameengine_private INTERFACE -# Include/Precompiled + Include/Precompiled ) target_link_libraries(corei_gameengine_private INTERFACE @@ -1186,7 +1186,7 @@ target_compile_definitions(corei_gameengine_private INTERFACE ) target_precompile_headers(corei_gameengine_private INTERFACE -# Include/Precompiled/PreRTS.h + Include/Precompiled/PreRTS.h ) target_include_directories(corei_gameengine_public INTERFACE diff --git a/GeneralsMD/Code/GameEngine/Include/Precompiled/PreRTS.h b/Core/GameEngine/Include/Precompiled/PreRTS.h similarity index 100% rename from GeneralsMD/Code/GameEngine/Include/Precompiled/PreRTS.h rename to Core/GameEngine/Include/Precompiled/PreRTS.h diff --git a/GeneralsMD/Code/GameEngine/Source/Precompiled/PreRTS.cpp b/Core/GameEngine/Source/Precompiled/PreRTS.cpp similarity index 100% rename from GeneralsMD/Code/GameEngine/Source/Precompiled/PreRTS.cpp rename to Core/GameEngine/Source/Precompiled/PreRTS.cpp diff --git a/Generals/Code/GameEngine/CMakeLists.txt b/Generals/Code/GameEngine/CMakeLists.txt index 9400c1a820c..c7cd1d6232a 100644 --- a/Generals/Code/GameEngine/CMakeLists.txt +++ b/Generals/Code/GameEngine/CMakeLists.txt @@ -509,7 +509,7 @@ set(GAMEENGINE_SRC # Include/GameNetwork/User.h # Include/GameNetwork/WOLBrowser/FEBDispatch.h # Include/GameNetwork/WOLBrowser/WebBrowser.h - Include/Precompiled/PreRTS.h +# Include/Precompiled/PreRTS.h # Source/Common/Audio/AudioEventRTS.cpp # Source/Common/Audio/AudioRequest.cpp # Source/Common/Audio/GameAudio.cpp @@ -1052,7 +1052,7 @@ set(GAMEENGINE_SRC # Source/GameNetwork/udp.cpp # Source/GameNetwork/User.cpp # Source/GameNetwork/WOLBrowser/WebBrowser.cpp - Source/Precompiled/PreRTS.cpp +# Source/Precompiled/PreRTS.cpp ) if(RTS_GAMEMEMORY_ENABLE) @@ -1096,5 +1096,5 @@ target_link_libraries(g_gameengine PUBLIC target_precompile_headers(g_gameengine PRIVATE [["Utility/CppMacros.h"]] # Must be first, to be removed when abandoning VC6 - Include/Precompiled/PreRTS.h +# Include/Precompiled/PreRTS.h ) diff --git a/Generals/Code/GameEngine/Include/Precompiled/PreRTS.h b/Generals/Code/GameEngine/Include/Precompiled/PreRTS.h deleted file mode 100644 index 3ce15b0ab63..00000000000 --- a/Generals/Code/GameEngine/Include/Precompiled/PreRTS.h +++ /dev/null @@ -1,133 +0,0 @@ -/* -** Command & Conquer Generals(tm) -** Copyright 2025 Electronic Arts Inc. -** -** This program is free software: you can redistribute it and/or modify -** it under the terms of the GNU General Public License as published by -** the Free Software Foundation, either version 3 of the License, or -** (at your option) any later version. -** -** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU General Public License for more details. -** -** You should have received a copy of the GNU General Public License -** along with this program. If not, see . -*/ - -//////////////////////////////////////////////////////////////////////////////// -// // -// (c) 2001-2003 Electronic Arts Inc. // -// // -//////////////////////////////////////////////////////////////////////////////// - -// This file contains all the header files that shouldn't change frequently. -// Be careful what you stick in here, because putting files that change often in here will -// tend to cheese people's goats. - -#pragma once - -//----------------------------------------------------------------------------- -// srj sez: this must come first, first, first. -#define _STLP_USE_NEWALLOC 1 -//#define _STLP_USE_CUSTOM_NEWALLOC STLSpecialAlloc -class STLSpecialAlloc; - - -// We actually don't use Windows for much other than timeGetTime, but it was included in 40 -// different .cpp files, so I bit the bullet and included it here. -// PLEASE DO NOT ABUSE WINDOWS OR IT WILL BE REMOVED ENTIRELY. :-) -//--------------------------------------------------------------------------------- System Includes -#define WIN32_LEAN_AND_MEAN -// TheSuperHackers @build JohnsterID 05/01/2026 Add ATL compatibility for MinGW-w64 builds -#if defined(__GNUC__) && defined(_WIN32) - #include -#endif -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#if defined(_MSC_VER) && _MSC_VER < 1300 -#include -#endif -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#ifndef DIRECTINPUT_VERSION -# define DIRECTINPUT_VERSION 0x800 -#endif - -#include - -//------------------------------------------------------------------------------------ STL Includes -// srj sez: no, include STLTypesdefs below, instead, thanks -//#include -//#include -//#include -//#include -//#include -//#include -//#include -//#include -//#include -//#include - -//------------------------------------------------------------------------------------ RTS Includes -// Icky. These have to be in this order. -#include "Lib/BaseType.h" -#include "Common/STLTypedefs.h" -#include "Common/Errors.h" -#include "Common/Debug.h" -#include "Common/AsciiString.h" -#include "Common/SubsystemInterface.h" - -#include "Common/GameCommon.h" -#include "Common/GameMemory.h" -#include "Common/GameType.h" -#include "Common/GlobalData.h" - -// You might not want Kindof in here because it seems like it changes frequently, but the problem -// is that Kindof is included EVERYWHERE, so it might as well be precompiled. -#include "Common/INI.h" -#include "Common/KindOf.h" -#include "Common/DisabledTypes.h" -#include "Common/NameKeyGenerator.h" -#include "GameClient/ClientRandomValue.h" -#include "GameLogic/LogicRandomValue.h" - -#include "Common/Thing.h" -#include "Common/UnicodeString.h" - -#if defined(__GNUC__) && defined(_WIN32) - #pragma GCC diagnostic pop -#endif diff --git a/Generals/Code/GameEngine/Source/Precompiled/PreRTS.cpp b/Generals/Code/GameEngine/Source/Precompiled/PreRTS.cpp deleted file mode 100644 index 251e710ea0b..00000000000 --- a/Generals/Code/GameEngine/Source/Precompiled/PreRTS.cpp +++ /dev/null @@ -1,28 +0,0 @@ -/* -** Command & Conquer Generals(tm) -** Copyright 2025 Electronic Arts Inc. -** -** This program is free software: you can redistribute it and/or modify -** it under the terms of the GNU General Public License as published by -** the Free Software Foundation, either version 3 of the License, or -** (at your option) any later version. -** -** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU General Public License for more details. -** -** You should have received a copy of the GNU General Public License -** along with this program. If not, see . -*/ - -//////////////////////////////////////////////////////////////////////////////// -// // -// (c) 2001-2003 Electronic Arts Inc. // -// // -//////////////////////////////////////////////////////////////////////////////// - -// PreRTS.cpp ///////////////////////////////////////////////////////////////////////////////////// -// Generates PreRTS.obj, which contains all precompiled header info. - -#include "PreRTS.h" diff --git a/GeneralsMD/Code/GameEngine/CMakeLists.txt b/GeneralsMD/Code/GameEngine/CMakeLists.txt index 044bfe6c17c..cf2ff70337a 100644 --- a/GeneralsMD/Code/GameEngine/CMakeLists.txt +++ b/GeneralsMD/Code/GameEngine/CMakeLists.txt @@ -547,7 +547,7 @@ set(GAMEENGINE_SRC # Include/GameNetwork/User.h # Include/GameNetwork/WOLBrowser/FEBDispatch.h # Include/GameNetwork/WOLBrowser/WebBrowser.h - Include/Precompiled/PreRTS.h +# Include/Precompiled/PreRTS.h # Source/Common/Audio/AudioEventRTS.cpp # Source/Common/Audio/AudioRequest.cpp # Source/Common/Audio/DynamicAudioEventInfo.cpp @@ -1128,7 +1128,7 @@ set(GAMEENGINE_SRC # Source/GameNetwork/udp.cpp # Source/GameNetwork/User.cpp # Source/GameNetwork/WOLBrowser/WebBrowser.cpp - Source/Precompiled/PreRTS.cpp +# Source/Precompiled/PreRTS.cpp ) if(RTS_GAMEMEMORY_ENABLE) @@ -1172,5 +1172,5 @@ target_link_libraries(z_gameengine PUBLIC target_precompile_headers(z_gameengine PRIVATE [["Utility/CppMacros.h"]] # Must be first, to be removed when abandoning VC6 - Include/Precompiled/PreRTS.h +# Include/Precompiled/PreRTS.h ) diff --git a/scripts/cpp/unify_move_files.py b/scripts/cpp/unify_move_files.py index 29d16c2b2bb..ea8df706ac6 100644 --- a/scripts/cpp/unify_move_files.py +++ b/scripts/cpp/unify_move_files.py @@ -648,6 +648,9 @@ def main(): #unify_file(Game.ZEROHOUR, "GameEngine/Source/Common/Bezier/BezFwdIterator.cpp", Game.CORE, "GameEngine/Source/Common/Bezier/BezFwdIterator.cpp") #unify_file(Game.ZEROHOUR, "GameEngine/Source/Common/Bezier/BezierSegment.cpp", Game.CORE, "GameEngine/Source/Common/Bezier/BezierSegment.cpp") + #unify_file(Game.ZEROHOUR, "GameEngine/Include/Precompiled/PreRTS.h", Game.CORE, "GameEngine/Include/Precompiled/PreRTS.h") + #unify_file(Game.ZEROHOUR, "GameEngine/Source/Precompiled/PreRTS.cpp", Game.CORE, "GameEngine/Source/Precompiled/PreRTS.cpp") + return