Skip to content

Commit 87ae6c2

Browse files
bobtistabobtista
committed
unify(common): Move Common files to Core
- Moved 110 identical Common files from Generals/GeneralsMD to Core - Updated CMakeLists.txt in Core, Generals, and GeneralsMD
1 parent 54b8765 commit 87ae6c2

File tree

223 files changed

+329
-17394
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

223 files changed

+329
-17394
lines changed

‎Core/GameEngine/CMakeLists.txt‎

Lines changed: 110 additions & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -12,36 +12,36 @@ set(GAMEENGINE_SRC
1212
Include/Common/AudioRequest.h
1313
Include/Common/AudioSettings.h
1414
# Include/Common/BattleHonors.h
15-
# Include/Common/BezFwdIterator.h
16-
# Include/Common/BezierSegment.h
17-
# Include/Common/BitFlags.h
18-
# Include/Common/BitFlagsIO.h
19-
# Include/Common/BorderColors.h
15+
Include/Common/BezFwdIterator.h
16+
Include/Common/BezierSegment.h
17+
Include/Common/BitFlags.h
18+
Include/Common/BitFlagsIO.h
19+
Include/Common/BorderColors.h
2020
# Include/Common/BuildAssistant.h
21-
# Include/Common/CDManager.h
22-
# Include/Common/ClientUpdateModule.h
21+
Include/Common/CDManager.h
22+
Include/Common/ClientUpdateModule.h
2323
# Include/Common/CommandLine.h
2424
Include/Common/crc.h
2525
Include/Common/CRCDebug.h
2626
# Include/Common/CriticalSection.h
2727
# Include/Common/CustomMatchPreferences.h
28-
# Include/Common/DamageFX.h
29-
# Include/Common/DataChunk.h
28+
Include/Common/DamageFX.h
29+
Include/Common/DataChunk.h
3030
Include/Common/Debug.h
31-
# Include/Common/Dict.h
32-
# Include/Common/Directory.h
31+
Include/Common/Dict.h
32+
Include/Common/Directory.h
3333
# Include/Common/DisabledTypes.h
34-
# Include/Common/DiscreteCircle.h
34+
Include/Common/DiscreteCircle.h
3535
# Include/Common/DrawModule.h
3636
Include/Common/DynamicAudioEventInfo.h
37-
# Include/Common/encrypt.h
37+
Include/Common/encrypt.h
3838
# Include/Common/Energy.h
39-
# Include/Common/Errors.h
39+
Include/Common/Errors.h
4040
Include/Common/file.h
4141
Include/Common/FileSystem.h
4242
Include/Common/FramePacer.h
4343
Include/Common/FrameRateLimit.h
44-
# Include/Common/FunctionLexicon.h
44+
Include/Common/FunctionLexicon.h
4545
Include/Common/GameAudio.h
4646
# Include/Common/GameCommon.h
4747
Include/Common/GameDefines.h
@@ -50,88 +50,88 @@ set(GAMEENGINE_SRC
5050
Include/Common/GameMemory.h
5151
Include/Common/GameMusic.h
5252
Include/Common/GameSounds.h
53-
# Include/Common/GameSpyMiscPreferences.h
54-
# Include/Common/GameState.h
55-
# Include/Common/GameStateMap.h
56-
# Include/Common/GameType.h
53+
Include/Common/GameSpyMiscPreferences.h
54+
Include/Common/GameState.h
55+
Include/Common/GameStateMap.h
56+
Include/Common/GameType.h
5757
Include/Common/GameUtility.h
58-
# Include/Common/Geometry.h
58+
Include/Common/Geometry.h
5959
# Include/Common/GlobalData.h
60-
# Include/Common/Handicap.h
61-
# Include/Common/IgnorePreferences.h
60+
Include/Common/Handicap.h
61+
Include/Common/IgnorePreferences.h
6262
# Include/Common/INI.h
63-
# Include/Common/INIException.h
63+
Include/Common/INIException.h
6464
# Include/Common/KindOf.h
65-
# Include/Common/LadderPreferences.h
66-
# Include/Common/Language.h
67-
# Include/Common/LatchRestore.h
68-
# Include/Common/List.h
65+
Include/Common/LadderPreferences.h
66+
Include/Common/Language.h
67+
Include/Common/LatchRestore.h
68+
Include/Common/List.h
6969
Include/Common/LocalFile.h
7070
Include/Common/LocalFileSystem.h
7171
# Include/Common/MapObject.h
7272
# Include/Common/MapReaderWriterInfo.h
7373
# Include/Common/MessageStream.h
74-
# Include/Common/MiniLog.h
74+
Include/Common/MiniLog.h
7575
Include/Common/MiscAudio.h
76-
# Include/Common/MissionStats.h
76+
Include/Common/MissionStats.h
7777
# Include/Common/ModelState.h
7878
# Include/Common/Module.h
79-
# Include/Common/ModuleFactory.h
80-
# Include/Common/Money.h
79+
Include/Common/ModuleFactory.h
80+
Include/Common/Money.h
8181
# Include/Common/MultiplayerSettings.h
8282
# Include/Common/NameKeyGenerator.h
8383
# Include/Common/ObjectStatusTypes.h
84-
# Include/Common/OSDisplay.h
85-
# Include/Common/Overridable.h
86-
# Include/Common/Override.h
87-
# Include/Common/PartitionSolver.h
88-
# Include/Common/PerfMetrics.h
84+
Include/Common/OSDisplay.h
85+
Include/Common/Overridable.h
86+
Include/Common/Override.h
87+
Include/Common/PartitionSolver.h
88+
Include/Common/PerfMetrics.h
8989
# Include/Common/PerfTimer.h
9090
# Include/Common/Player.h
91-
# Include/Common/PlayerList.h
91+
Include/Common/PlayerList.h
9292
# Include/Common/PlayerTemplate.h
93-
# Include/Common/ProductionPrerequisite.h
94-
# Include/Common/QuickmatchPreferences.h
95-
# Include/Common/QuotedPrintable.h
96-
# Include/Common/Radar.h
93+
Include/Common/ProductionPrerequisite.h
94+
Include/Common/QuickmatchPreferences.h
95+
Include/Common/QuotedPrintable.h
96+
Include/Common/Radar.h
9797
Include/Common/RAMFile.h
9898
Include/Common/RandomValue.h
99-
# Include/Common/Recorder.h
99+
Include/Common/Recorder.h
100100
# Include/Common/Registry.h
101101
Include/Common/ReplaySimulation.h
102-
# Include/Common/ResourceGatheringManager.h
103-
# Include/Common/Science.h
102+
Include/Common/ResourceGatheringManager.h
103+
Include/Common/Science.h
104104
# Include/Common/ScopedMutex.h
105-
# Include/Common/ScoreKeeper.h
105+
Include/Common/ScoreKeeper.h
106106
#Include/Common/simpleplayer.h # unused
107107
# Include/Common/SkirmishBattleHonors.h
108108
# Include/Common/SkirmishPreferences.h
109-
# Include/Common/Snapshot.h
109+
Include/Common/Snapshot.h
110110
# Include/Common/SparseMatchFinder.h
111111
# Include/Common/SpecialPower.h
112-
# Include/Common/SpecialPowerMaskType.h
112+
Include/Common/SpecialPowerMaskType.h
113113
# Include/Common/SpecialPowerType.h
114-
# Include/Common/StackDump.h
114+
Include/Common/StackDump.h
115115
# Include/Common/StateMachine.h
116-
# Include/Common/StatsCollector.h
117-
# Include/Common/STLTypedefs.h
116+
Include/Common/StatsCollector.h
117+
Include/Common/STLTypedefs.h
118118
Include/Common/StreamingArchiveFile.h
119119
# Include/Common/SubsystemInterface.h
120-
# Include/Common/SystemInfo.h
120+
Include/Common/SystemInfo.h
121121
# Include/Common/Team.h
122-
# Include/Common/Terrain.h
122+
Include/Common/Terrain.h
123123
# Include/Common/TerrainTypes.h
124-
# Include/Common/Thing.h
124+
Include/Common/Thing.h
125125
# Include/Common/ThingFactory.h
126-
# Include/Common/ThingSort.h
126+
Include/Common/ThingSort.h
127127
# Include/Common/ThingTemplate.h
128-
# Include/Common/TunnelTracker.h
128+
Include/Common/TunnelTracker.h
129129
Include/Common/UnicodeString.h
130130
# Include/Common/UnitTimings.h
131131
# Include/Common/Upgrade.h
132132
#Include/Common/urllaunch.h # unused
133133
# Include/Common/UserPreferences.h
134-
# Include/Common/version.h
134+
Include/Common/version.h
135135
# Include/Common/WellKnownKeys.h
136136
Include/Common/WorkerProcess.h
137137
Include/Common/Xfer.h
@@ -562,129 +562,129 @@ set(GAMEENGINE_SRC
562562
Source/Common/Audio/GameSounds.cpp
563563
#Source/Common/Audio/simpleplayer.cpp # unused
564564
#Source/Common/Audio/urllaunch.cpp # unused
565-
# Source/Common/Bezier/BezFwdIterator.cpp
566-
# Source/Common/Bezier/BezierSegment.cpp
565+
Source/Common/Bezier/BezFwdIterator.cpp
566+
Source/Common/Bezier/BezierSegment.cpp
567567
# Source/Common/BitFlags.cpp
568568
# Source/Common/CommandLine.cpp
569569
Source/Common/crc.cpp
570570
Source/Common/CRCDebug.cpp
571571
# Source/Common/DamageFX.cpp
572-
# Source/Common/Dict.cpp
573-
# Source/Common/DiscreteCircle.cpp
572+
Source/Common/Dict.cpp
573+
Source/Common/DiscreteCircle.cpp
574574
Source/Common/FramePacer.cpp
575575
Source/Common/FrameRateLimit.cpp
576576
# Source/Common/GameEngine.cpp
577577
# Source/Common/GameLOD.cpp
578-
# Source/Common/GameMain.cpp
578+
Source/Common/GameMain.cpp
579579
Source/Common/GameUtility.cpp
580580
# Source/Common/GlobalData.cpp
581581
# Source/Common/INI/INI.cpp
582-
# Source/Common/INI/INIAiData.cpp
583-
# Source/Common/INI/INIAnimation.cpp
582+
Source/Common/INI/INIAiData.cpp
583+
Source/Common/INI/INIAnimation.cpp
584584
Source/Common/INI/INIAudioEventInfo.cpp
585-
# Source/Common/INI/INICommandButton.cpp
586-
# Source/Common/INI/INICommandSet.cpp
587-
# Source/Common/INI/INIControlBarScheme.cpp
588-
# Source/Common/INI/INICrate.cpp
589-
# Source/Common/INI/INIDamageFX.cpp
590-
# Source/Common/INI/INIDrawGroupInfo.cpp
591-
# Source/Common/INI/INIGameData.cpp
585+
Source/Common/INI/INICommandButton.cpp
586+
Source/Common/INI/INICommandSet.cpp
587+
Source/Common/INI/INIControlBarScheme.cpp
588+
Source/Common/INI/INICrate.cpp
589+
Source/Common/INI/INIDamageFX.cpp
590+
Source/Common/INI/INIDrawGroupInfo.cpp
591+
Source/Common/INI/INIGameData.cpp
592592
# Source/Common/INI/INIMapCache.cpp
593-
# Source/Common/INI/INIMapData.cpp
593+
Source/Common/INI/INIMapData.cpp
594594
# Source/Common/INI/INIMappedImage.cpp
595595
Source/Common/INI/INIMiscAudio.cpp
596-
# Source/Common/INI/INIModel.cpp
596+
Source/Common/INI/INIModel.cpp
597597
# Source/Common/INI/INIMultiplayer.cpp
598-
# Source/Common/INI/INIObject.cpp
599-
# Source/Common/INI/INIParticleSys.cpp
600-
# Source/Common/INI/INISpecialPower.cpp
601-
# Source/Common/INI/INITerrain.cpp
602-
# Source/Common/INI/INITerrainBridge.cpp
603-
# Source/Common/INI/INITerrainRoad.cpp
604-
# Source/Common/INI/INIUpgrade.cpp
598+
Source/Common/INI/INIObject.cpp
599+
Source/Common/INI/INIParticleSys.cpp
600+
Source/Common/INI/INISpecialPower.cpp
601+
Source/Common/INI/INITerrain.cpp
602+
Source/Common/INI/INITerrainBridge.cpp
603+
Source/Common/INI/INITerrainRoad.cpp
604+
Source/Common/INI/INIUpgrade.cpp
605605
Source/Common/INI/INIVideo.cpp
606-
# Source/Common/INI/INIWater.cpp
607-
# Source/Common/INI/INIWeapon.cpp
608-
# Source/Common/INI/INIWebpageURL.cpp
609-
# Source/Common/Language.cpp
606+
Source/Common/INI/INIWater.cpp
607+
Source/Common/INI/INIWeapon.cpp
608+
Source/Common/INI/INIWebpageURL.cpp
609+
Source/Common/Language.cpp
610610
# Source/Common/MessageStream.cpp
611-
# Source/Common/MiniLog.cpp
611+
Source/Common/MiniLog.cpp
612612
# Source/Common/MultiplayerSettings.cpp
613-
# Source/Common/NameKeyGenerator.cpp
614-
# Source/Common/PartitionSolver.cpp
613+
Source/Common/NameKeyGenerator.cpp
614+
Source/Common/PartitionSolver.cpp
615615
# Source/Common/PerfTimer.cpp
616616
Source/Common/RandomValue.cpp
617617
# Source/Common/Recorder.cpp
618618
Source/Common/ReplaySimulation.cpp
619619
# Source/Common/RTS/AcademyStats.cpp
620620
# Source/Common/RTS/ActionManager.cpp
621621
# Source/Common/RTS/Energy.cpp
622-
# Source/Common/RTS/Handicap.cpp
623-
# Source/Common/RTS/MissionStats.cpp
622+
Source/Common/RTS/Handicap.cpp
623+
Source/Common/RTS/MissionStats.cpp
624624
# Source/Common/RTS/Money.cpp
625625
# Source/Common/RTS/Player.cpp
626-
# Source/Common/RTS/PlayerList.cpp
626+
Source/Common/RTS/PlayerList.cpp
627627
# Source/Common/RTS/PlayerTemplate.cpp
628628
# Source/Common/RTS/ProductionPrerequisite.cpp
629-
# Source/Common/RTS/ResourceGatheringManager.cpp
630-
# Source/Common/RTS/Science.cpp
631-
# Source/Common/RTS/ScoreKeeper.cpp
629+
Source/Common/RTS/ResourceGatheringManager.cpp
630+
Source/Common/RTS/Science.cpp
631+
Source/Common/RTS/ScoreKeeper.cpp
632632
# Source/Common/RTS/SpecialPower.cpp
633633
# Source/Common/RTS/Team.cpp
634634
# Source/Common/RTS/TunnelTracker.cpp
635635
# Source/Common/SkirmishBattleHonors.cpp
636636
# Source/Common/StateMachine.cpp
637-
# Source/Common/StatsCollector.cpp
637+
Source/Common/StatsCollector.cpp
638638
Source/Common/System/ArchiveFile.cpp
639639
Source/Common/System/ArchiveFileSystem.cpp
640640
Source/Common/System/AsciiString.cpp
641641
# Source/Common/System/BuildAssistant.cpp
642-
# Source/Common/System/CDManager.cpp
643-
# Source/Common/System/CriticalSection.cpp
644-
# Source/Common/System/DataChunk.cpp
642+
Source/Common/System/CDManager.cpp
643+
Source/Common/System/CriticalSection.cpp
644+
Source/Common/System/DataChunk.cpp
645645
Source/Common/System/Debug.cpp
646-
# Source/Common/System/Directory.cpp
646+
Source/Common/System/Directory.cpp
647647
# Source/Common/System/DisabledTypes.cpp
648-
# Source/Common/System/encrypt.cpp
648+
Source/Common/System/encrypt.cpp
649649
Source/Common/System/File.cpp
650650
Source/Common/System/FileSystem.cpp
651651
# Source/Common/System/FunctionLexicon.cpp
652-
# Source/Common/System/GameCommon.cpp
652+
Source/Common/System/GameCommon.cpp
653653
#Source/Common/System/GameMemory.cpp # is conditionally appended
654654
#Source/Common/System/GameMemoryInit.cpp # is conditionally appended
655-
# Source/Common/System/GameType.cpp
656-
# Source/Common/System/Geometry.cpp
655+
Source/Common/System/GameType.cpp
656+
Source/Common/System/Geometry.cpp
657657
# Source/Common/System/KindOf.cpp
658-
# Source/Common/System/List.cpp
658+
Source/Common/System/List.cpp
659659
Source/Common/System/LocalFile.cpp
660660
Source/Common/System/LocalFileSystem.cpp
661661
# Source/Common/System/ObjectStatusTypes.cpp
662-
# Source/Common/System/QuotedPrintable.cpp
662+
Source/Common/System/QuotedPrintable.cpp
663663
# Source/Common/System/Radar.cpp
664664
Source/Common/System/RAMFile.cpp
665665
# Source/Common/System/registry.cpp
666666
# Source/Common/System/SaveGame/GameState.cpp
667667
# Source/Common/System/SaveGame/GameStateMap.cpp
668-
# Source/Common/System/Snapshot.cpp
669-
# Source/Common/System/StackDump.cpp
668+
Source/Common/System/Snapshot.cpp
669+
Source/Common/System/StackDump.cpp
670670
Source/Common/System/StreamingArchiveFile.cpp
671671
# Source/Common/System/SubsystemInterface.cpp
672-
# Source/Common/System/Trig.cpp
672+
Source/Common/System/Trig.cpp
673673
Source/Common/System/UnicodeString.cpp
674674
# Source/Common/System/Upgrade.cpp
675675
Source/Common/System/Xfer.cpp
676676
Source/Common/System/XferCRC.cpp
677677
Source/Common/System/XferLoad.cpp
678678
Source/Common/System/XferSave.cpp
679-
# Source/Common/TerrainTypes.cpp
680-
# Source/Common/Thing/DrawModule.cpp
679+
Source/Common/TerrainTypes.cpp
680+
Source/Common/Thing/DrawModule.cpp
681681
# Source/Common/Thing/Module.cpp
682682
# Source/Common/Thing/ModuleFactory.cpp
683-
# Source/Common/Thing/Thing.cpp
683+
Source/Common/Thing/Thing.cpp
684684
# Source/Common/Thing/ThingFactory.cpp
685685
# Source/Common/Thing/ThingTemplate.cpp
686686
# Source/Common/UserPreferences.cpp
687-
# Source/Common/version.cpp
687+
Source/Common/version.cpp
688688
Source/Common/WorkerProcess.cpp
689689
# Source/GameClient/ClientInstance.cpp
690690
# Source/GameClient/Color.cpp

‎GeneralsMD/Code/GameEngine/Include/Common/BezFwdIterator.h‎ renamed to ‎Core/GameEngine/Include/Common/BezFwdIterator.h‎

File renamed without changes.

‎GeneralsMD/Code/GameEngine/Include/Common/BezierSegment.h‎ renamed to ‎Core/GameEngine/Include/Common/BezierSegment.h‎

File renamed without changes.

‎GeneralsMD/Code/GameEngine/Include/Common/BitFlags.h‎ renamed to ‎Core/GameEngine/Include/Common/BitFlags.h‎

File renamed without changes.

‎GeneralsMD/Code/GameEngine/Include/Common/BitFlagsIO.h‎ renamed to ‎Core/GameEngine/Include/Common/BitFlagsIO.h‎

File renamed without changes.

‎GeneralsMD/Code/GameEngine/Include/Common/BorderColors.h‎ renamed to ‎Core/GameEngine/Include/Common/BorderColors.h‎

File renamed without changes.

‎GeneralsMD/Code/GameEngine/Include/Common/CDManager.h‎ renamed to ‎Core/GameEngine/Include/Common/CDManager.h‎

File renamed without changes.

‎GeneralsMD/Code/GameEngine/Include/Common/ClientUpdateModule.h‎ renamed to ‎Core/GameEngine/Include/Common/ClientUpdateModule.h‎

File renamed without changes.

‎GeneralsMD/Code/GameEngine/Include/Common/DamageFX.h‎ renamed to ‎Core/GameEngine/Include/Common/DamageFX.h‎

File renamed without changes.

‎GeneralsMD/Code/GameEngine/Include/Common/DataChunk.h‎ renamed to ‎Core/GameEngine/Include/Common/DataChunk.h‎

File renamed without changes.

0 commit comments

Comments
 (0)