Skip to content

Commit 1174285

Browse files
committed
unify(common): Move some common system files to Core (TheSuperHackers#2185)
All that is needed for ParticleEditor to move to Core
1 parent 077b657 commit 1174285

File tree

34 files changed

+58
-4478
lines changed

34 files changed

+58
-4478
lines changed

Core/GameEngine/CMakeLists.txt

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@ set(GAMEENGINE_SRC
3737
Include/Common/DynamicAudioEventInfo.h
3838
# Include/Common/encrypt.h
3939
# Include/Common/Energy.h
40-
# Include/Common/Errors.h
40+
Include/Common/Errors.h
4141
Include/Common/file.h
4242
Include/Common/FileSystem.h
4343
Include/Common/FramePacer.h
4444
Include/Common/FrameRateLimit.h
4545
# Include/Common/FunctionLexicon.h
4646
Include/Common/GameAudio.h
47-
# Include/Common/GameCommon.h
47+
Include/Common/GameCommon.h
4848
Include/Common/GameDefines.h
4949
# Include/Common/GameEngine.h
5050
# Include/Common/GameLOD.h
@@ -54,13 +54,13 @@ set(GAMEENGINE_SRC
5454
# Include/Common/GameSpyMiscPreferences.h
5555
# Include/Common/GameState.h
5656
# Include/Common/GameStateMap.h
57-
# Include/Common/GameType.h
57+
Include/Common/GameType.h
5858
Include/Common/GameUtility.h
5959
# Include/Common/Geometry.h
6060
# Include/Common/GlobalData.h
6161
# Include/Common/Handicap.h
6262
# Include/Common/IgnorePreferences.h
63-
# Include/Common/INI.h
63+
Include/Common/INI.h
6464
# Include/Common/INIException.h
6565
# Include/Common/KindOf.h
6666
# Include/Common/LadderPreferences.h
@@ -108,17 +108,17 @@ set(GAMEENGINE_SRC
108108
#Include/Common/simpleplayer.h # unused
109109
# Include/Common/SkirmishBattleHonors.h
110110
# Include/Common/SkirmishPreferences.h
111-
# Include/Common/Snapshot.h
111+
Include/Common/Snapshot.h
112112
# Include/Common/SparseMatchFinder.h
113113
# Include/Common/SpecialPower.h
114114
# Include/Common/SpecialPowerMaskType.h
115115
# Include/Common/SpecialPowerType.h
116116
# Include/Common/StackDump.h
117117
# Include/Common/StateMachine.h
118118
# Include/Common/StatsCollector.h
119-
# Include/Common/STLTypedefs.h
119+
Include/Common/STLTypedefs.h
120120
Include/Common/StreamingArchiveFile.h
121-
# Include/Common/SubsystemInterface.h
121+
Include/Common/SubsystemInterface.h
122122
# Include/Common/SystemInfo.h
123123
# Include/Common/Team.h
124124
# Include/Common/Terrain.h
@@ -145,7 +145,7 @@ set(GAMEENGINE_SRC
145145
# Include/GameClient/AnimateWindowManager.h
146146
# Include/GameClient/CampaignManager.h
147147
# Include/GameClient/CDCheck.h
148-
# Include/GameClient/ChallengeGenerals.h
148+
Include/GameClient/ChallengeGenerals.h
149149
# Include/GameClient/ClientInstance.h
150150
Include/GameClient/ClientRandomValue.h
151151
# Include/GameClient/Color.h
@@ -582,7 +582,7 @@ set(GAMEENGINE_SRC
582582
# Source/Common/GameMain.cpp
583583
Source/Common/GameUtility.cpp
584584
# Source/Common/GlobalData.cpp
585-
# Source/Common/INI/INI.cpp
585+
Source/Common/INI/INI.cpp
586586
# Source/Common/INI/INIAiData.cpp
587587
# Source/Common/INI/INIAnimation.cpp
588588
Source/Common/INI/INIAudioEventInfo.cpp
@@ -653,10 +653,10 @@ set(GAMEENGINE_SRC
653653
Source/Common/System/File.cpp
654654
Source/Common/System/FileSystem.cpp
655655
# Source/Common/System/FunctionLexicon.cpp
656-
# Source/Common/System/GameCommon.cpp
656+
Source/Common/System/GameCommon.cpp
657657
#Source/Common/System/GameMemory.cpp # is conditionally appended
658658
#Source/Common/System/GameMemoryInit.cpp # is conditionally appended
659-
# Source/Common/System/GameType.cpp
659+
Source/Common/System/GameType.cpp
660660
# Source/Common/System/Geometry.cpp
661661
# Source/Common/System/KindOf.cpp
662662
# Source/Common/System/List.cpp
@@ -670,10 +670,10 @@ set(GAMEENGINE_SRC
670670
# Source/Common/System/registry.cpp
671671
# Source/Common/System/SaveGame/GameState.cpp
672672
# Source/Common/System/SaveGame/GameStateMap.cpp
673-
# Source/Common/System/Snapshot.cpp
673+
Source/Common/System/Snapshot.cpp
674674
# Source/Common/System/StackDump.cpp
675675
Source/Common/System/StreamingArchiveFile.cpp
676-
# Source/Common/System/SubsystemInterface.cpp
676+
Source/Common/System/SubsystemInterface.cpp
677677
# Source/Common/System/Trig.cpp
678678
Source/Common/System/UnicodeString.cpp
679679
# Source/Common/System/Upgrade.cpp
@@ -710,7 +710,7 @@ set(GAMEENGINE_SRC
710710
# Source/GameClient/GlobalLanguage.cpp
711711
# Source/GameClient/GraphDraw.cpp
712712
# Source/GameClient/GUI/AnimateWindowManager.cpp
713-
# Source/GameClient/GUI/ChallengeGenerals.cpp
713+
Source/GameClient/GUI/ChallengeGenerals.cpp
714714
# Source/GameClient/GUI/ControlBar/ControlBar.cpp
715715
# Source/GameClient/GUI/ControlBar/ControlBarBeacon.cpp
716716
# Source/GameClient/GUI/ControlBar/ControlBarCommand.cpp
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

GeneralsMD/Code/GameEngine/Include/Common/SubsystemInterface.h renamed to Core/GameEngine/Include/Common/SubsystemInterface.h

File renamed without changes.

GeneralsMD/Code/GameEngine/Include/GameClient/ChallengeGenerals.h renamed to Core/GameEngine/Include/GameClient/ChallengeGenerals.h

File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)