Skip to content

unify(common): Move common system files to Core needed for ParticleEditor #2185

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xezon wants to merge 2 commits into
base: main
Choose a base branch
from
+63 −4,977
Open

unify(common): Move common system files to Core needed for ParticleEditor #2185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
acf29bf
unify(lib): Move BaseType.h, trig.h to Core (#2185)
xezon Jan 25, 2026
8fd7226
unify(common): Move common system files to Core needed for ParticleEd…
xezon Jan 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ target_include_directories(corei_libraries_source_wwvegas_wwlib INTERFACE "Libra
target_include_directories(corei_main INTERFACE "Main")

target_sources(corei_libraries_include PRIVATE
Libraries/Include/Lib/BaseType.h
Libraries/Include/Lib/BaseTypeCore.h
Libraries/Include/Lib/trig.h
Libraries/Include/rts/debug.h
Libraries/Include/rts/profile.h
)
Expand Down
28 changes: 14 additions & 14 deletions Core/GameEngine/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,14 @@ set(GAMEENGINE_SRC
Include/Common/DynamicAudioEventInfo.h
# Include/Common/encrypt.h
# Include/Common/Energy.h
# Include/Common/Errors.h
Include/Common/Errors.h
Include/Common/file.h
Include/Common/FileSystem.h
Include/Common/FramePacer.h
Include/Common/FrameRateLimit.h
# Include/Common/FunctionLexicon.h
Include/Common/GameAudio.h
# Include/Common/GameCommon.h
Include/Common/GameCommon.h
Include/Common/GameDefines.h
# Include/Common/GameEngine.h
# Include/Common/GameLOD.h
Expand All @@ -54,13 +54,13 @@ set(GAMEENGINE_SRC
# Include/Common/GameSpyMiscPreferences.h
# Include/Common/GameState.h
# Include/Common/GameStateMap.h
# Include/Common/GameType.h
Include/Common/GameType.h
Include/Common/GameUtility.h
# Include/Common/Geometry.h
# Include/Common/GlobalData.h
# Include/Common/Handicap.h
# Include/Common/IgnorePreferences.h
# Include/Common/INI.h
Include/Common/INI.h
# Include/Common/INIException.h
# Include/Common/KindOf.h
# Include/Common/LadderPreferences.h
Expand Down Expand Up @@ -108,17 +108,17 @@ set(GAMEENGINE_SRC
#Include/Common/simpleplayer.h # unused
# Include/Common/SkirmishBattleHonors.h
# Include/Common/SkirmishPreferences.h
# Include/Common/Snapshot.h
Include/Common/Snapshot.h
# Include/Common/SparseMatchFinder.h
# Include/Common/SpecialPower.h
# Include/Common/SpecialPowerMaskType.h
# Include/Common/SpecialPowerType.h
# Include/Common/StackDump.h
# Include/Common/StateMachine.h
# Include/Common/StatsCollector.h
# Include/Common/STLTypedefs.h
Include/Common/STLTypedefs.h
Include/Common/StreamingArchiveFile.h
# Include/Common/SubsystemInterface.h
Include/Common/SubsystemInterface.h
# Include/Common/SystemInfo.h
# Include/Common/Team.h
# Include/Common/Terrain.h
Expand All @@ -145,7 +145,7 @@ set(GAMEENGINE_SRC
# Include/GameClient/AnimateWindowManager.h
# Include/GameClient/CampaignManager.h
# Include/GameClient/CDCheck.h
# Include/GameClient/ChallengeGenerals.h
Include/GameClient/ChallengeGenerals.h
# Include/GameClient/ClientInstance.h
Include/GameClient/ClientRandomValue.h
# Include/GameClient/Color.h
Expand Down Expand Up @@ -582,7 +582,7 @@ set(GAMEENGINE_SRC
# Source/Common/GameMain.cpp
Source/Common/GameUtility.cpp
# Source/Common/GlobalData.cpp
# Source/Common/INI/INI.cpp
Source/Common/INI/INI.cpp
# Source/Common/INI/INIAiData.cpp
# Source/Common/INI/INIAnimation.cpp
Source/Common/INI/INIAudioEventInfo.cpp
Expand Down Expand Up @@ -653,10 +653,10 @@ set(GAMEENGINE_SRC
Source/Common/System/File.cpp
Source/Common/System/FileSystem.cpp
# Source/Common/System/FunctionLexicon.cpp
# Source/Common/System/GameCommon.cpp
Source/Common/System/GameCommon.cpp
#Source/Common/System/GameMemory.cpp # is conditionally appended
#Source/Common/System/GameMemoryInit.cpp # is conditionally appended
# Source/Common/System/GameType.cpp
Source/Common/System/GameType.cpp
# Source/Common/System/Geometry.cpp
# Source/Common/System/KindOf.cpp
# Source/Common/System/List.cpp
Expand All @@ -670,10 +670,10 @@ set(GAMEENGINE_SRC
# Source/Common/System/registry.cpp
# Source/Common/System/SaveGame/GameState.cpp
# Source/Common/System/SaveGame/GameStateMap.cpp
# Source/Common/System/Snapshot.cpp
Source/Common/System/Snapshot.cpp
# Source/Common/System/StackDump.cpp
Source/Common/System/StreamingArchiveFile.cpp
# Source/Common/System/SubsystemInterface.cpp
Source/Common/System/SubsystemInterface.cpp
# Source/Common/System/Trig.cpp
Source/Common/System/UnicodeString.cpp
# Source/Common/System/Upgrade.cpp
Expand Down Expand Up @@ -710,7 +710,7 @@ set(GAMEENGINE_SRC
# Source/GameClient/GlobalLanguage.cpp
# Source/GameClient/GraphDraw.cpp
# Source/GameClient/GUI/AnimateWindowManager.cpp
# Source/GameClient/GUI/ChallengeGenerals.cpp
Source/GameClient/GUI/ChallengeGenerals.cpp
# Source/GameClient/GUI/ControlBar/ControlBar.cpp
# Source/GameClient/GUI/ControlBar/ControlBarBeacon.cpp
# Source/GameClient/GUI/ControlBar/ControlBarCommand.cpp
Expand Down
0 ...D/Code/GameEngine/Include/Common/Errors.h → Core/GameEngine/Include/Common/Errors.h
View file
Open in desktop
File renamed without changes.
0 ...de/GameEngine/Include/Common/GameCommon.h → Core/GameEngine/Include/Common/GameCommon.h
View file
Open in desktop
File renamed without changes.
0 ...Code/GameEngine/Include/Common/GameType.h → Core/GameEngine/Include/Common/GameType.h
View file
Open in desktop
File renamed without changes.
0 ...lsMD/Code/GameEngine/Include/Common/INI.h → Core/GameEngine/Include/Common/INI.h
View file
Open in desktop
File renamed without changes.
0 ...e/GameEngine/Include/Common/STLTypedefs.h → Core/GameEngine/Include/Common/STLTypedefs.h
View file
Open in desktop
File renamed without changes.
0 ...Code/GameEngine/Include/Common/Snapshot.h → Core/GameEngine/Include/Common/Snapshot.h
View file
Open in desktop
File renamed without changes.
0 ...ngine/Include/Common/SubsystemInterface.h → ...ngine/Include/Common/SubsystemInterface.h
View file
Open in desktop
File renamed without changes.
0 ...ne/Include/GameClient/ChallengeGenerals.h → ...ne/Include/GameClient/ChallengeGenerals.h
View file
Open in desktop
File renamed without changes.
0 ...Code/GameEngine/Source/Common/INI/INI.cpp → Core/GameEngine/Source/Common/INI/INI.cpp
View file
Open in desktop
File renamed without changes.
0 ...ngine/Source/Common/System/GameCommon.cpp → ...ngine/Source/Common/System/GameCommon.cpp
View file
Open in desktop
File renamed without changes.
0 ...eEngine/Source/Common/System/GameType.cpp → ...eEngine/Source/Common/System/GameType.cpp
View file
Open in desktop
File renamed without changes.
0 ...eEngine/Source/Common/System/Snapshot.cpp → ...eEngine/Source/Common/System/Snapshot.cpp
View file
Open in desktop
File renamed without changes.
0 ...urce/Common/System/SubsystemInterface.cpp → ...urce/Common/System/SubsystemInterface.cpp
View file
Open in desktop
File renamed without changes.
0 ...urce/GameClient/GUI/ChallengeGenerals.cpp → ...urce/GameClient/GUI/ChallengeGenerals.cpp
View file
Open in desktop
File renamed without changes.
0 ...sMD/Code/Libraries/Include/Lib/BaseType.h → Core/Libraries/Include/Lib/BaseType.h
View file
Open in desktop
File renamed without changes.
0 GeneralsMD/Code/Libraries/Include/Lib/trig.h → Core/Libraries/Include/Lib/trig.h
View file
Open in desktop
File renamed without changes.
8 changes: 0 additions & 8 deletions Generals/Code/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,14 @@
# g stands for Generals, i stands for Interface
add_library(gi_gameengine_include INTERFACE)
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_include_directories(gi_libraries_include INTERFACE "Libraries/Include")
target_include_directories(gi_libraries_source_wwvegas INTERFACE "Libraries/Source/WWVegas")
target_include_directories(gi_main INTERFACE "Main")

target_sources(gi_libraries_include PRIVATE
Libraries/Include/Lib/BaseType.h
Libraries/Include/Lib/trig.h
)
target_compile_definitions(gi_always INTERFACE
RTS_GENERALS=1
)
Expand All @@ -25,11 +19,9 @@ target_link_libraries(gi_gameengine_include INTERFACE
corei_gameengine_include
)
target_link_libraries(gi_always INTERFACE
gi_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
)

Expand Down
28 changes: 14 additions & 14 deletions Generals/Code/GameEngine/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ set(GAMEENGINE_SRC
Include/Common/DrawModule.h
Include/Common/encrypt.h
Include/Common/Energy.h
Include/Common/Errors.h
# Include/Common/Errors.h
# Include/Common/file.h
# Include/Common/FileSystem.h
Include/Common/FunctionLexicon.h
# Include/Common/GameAudio.h
Include/Common/GameCommon.h
# Include/Common/GameCommon.h
# Include/Common/GameDefines.h
Include/Common/GameEngine.h
Include/Common/GameLOD.h
Expand All @@ -48,12 +48,12 @@ set(GAMEENGINE_SRC
Include/Common/GameSpyMiscPreferences.h
Include/Common/GameState.h
Include/Common/GameStateMap.h
Include/Common/GameType.h
# Include/Common/GameType.h
Include/Common/Geometry.h
Include/Common/GlobalData.h
Include/Common/Handicap.h
Include/Common/IgnorePreferences.h
Include/Common/INI.h
# Include/Common/INI.h
Include/Common/INIException.h
Include/Common/KindOf.h
Include/Common/LadderPreferences.h
Expand Down Expand Up @@ -98,17 +98,17 @@ set(GAMEENGINE_SRC
Include/Common/ScoreKeeper.h
Include/Common/SkirmishBattleHonors.h
Include/Common/SkirmishPreferences.h
Include/Common/Snapshot.h
# Include/Common/Snapshot.h
Include/Common/SparseMatchFinder.h
Include/Common/SpecialPower.h
Include/Common/SpecialPowerMaskType.h
Include/Common/SpecialPowerType.h
Include/Common/StackDump.h
Include/Common/StateMachine.h
Include/Common/StatsCollector.h
Include/Common/STLTypedefs.h
# Include/Common/STLTypedefs.h
# Include/Common/StreamingArchiveFile.h
Include/Common/SubsystemInterface.h
# Include/Common/SubsystemInterface.h
Include/Common/SystemInfo.h
Include/Common/Team.h
Include/Common/Terrain.h
Expand All @@ -132,7 +132,7 @@ set(GAMEENGINE_SRC
# Include/Common/XferSave.h
Include/GameClient/Anim2D.h
Include/GameClient/AnimateWindowManager.h
Include/GameClient/ChallengeGenerals.h
# Include/GameClient/ChallengeGenerals.h
Include/GameClient/CampaignManager.h
Include/GameClient/CDCheck.h
Include/GameClient/ClientInstance.h
Expand Down Expand Up @@ -533,7 +533,7 @@ set(GAMEENGINE_SRC
Source/Common/GameLOD.cpp
Source/Common/GameMain.cpp
Source/Common/GlobalData.cpp
Source/Common/INI/INI.cpp
# Source/Common/INI/INI.cpp
Source/Common/INI/INIAiData.cpp
Source/Common/INI/INIAnimation.cpp
# Source/Common/INI/INIAudioEventInfo.cpp
Expand Down Expand Up @@ -602,9 +602,9 @@ set(GAMEENGINE_SRC
# Source/Common/System/File.cpp
# Source/Common/System/FileSystem.cpp
Source/Common/System/FunctionLexicon.cpp
Source/Common/System/GameCommon.cpp
# Source/Common/System/GameCommon.cpp
#Source/Common/System/GameMemory.cpp
Source/Common/System/GameType.cpp
# Source/Common/System/GameType.cpp
Source/Common/System/Geometry.cpp
Source/Common/System/KindOf.cpp
Source/Common/System/List.cpp
Expand All @@ -618,10 +618,10 @@ set(GAMEENGINE_SRC
Source/Common/System/registry.cpp
Source/Common/System/SaveGame/GameState.cpp
Source/Common/System/SaveGame/GameStateMap.cpp
Source/Common/System/Snapshot.cpp
# Source/Common/System/Snapshot.cpp
Source/Common/System/StackDump.cpp
# Source/Common/System/StreamingArchiveFile.cpp
Source/Common/System/SubsystemInterface.cpp
# Source/Common/System/SubsystemInterface.cpp
Source/Common/System/Trig.cpp
# Source/Common/System/UnicodeString.cpp
Source/Common/System/Upgrade.cpp
Expand Down Expand Up @@ -658,7 +658,7 @@ set(GAMEENGINE_SRC
Source/GameClient/GlobalLanguage.cpp
Source/GameClient/GraphDraw.cpp
Source/GameClient/GUI/AnimateWindowManager.cpp
Source/GameClient/GUI/ChallengeGenerals.cpp
# Source/GameClient/GUI/ChallengeGenerals.cpp
Source/GameClient/GUI/ControlBar/ControlBar.cpp
Source/GameClient/GUI/ControlBar/ControlBarBeacon.cpp
Source/GameClient/GUI/ControlBar/ControlBarCommand.cpp
Expand Down
67 changes: 0 additions & 67 deletions Generals/Code/GameEngine/Include/Common/Errors.h
View file
Open in desktop

This file was deleted.

Loading
Loading