unify(common): Move DamageFX, Dict, DiscreteCircle, Language, MessageStream... to Core - #3038
Merged
Merged
Conversation
|
| Filename | Overview |
|---|---|
| Core/GameEngine/CMakeLists.txt | Enables the nine shared header/source pairs on the Core INTERFACE source target consumed by both game libraries. |
| Generals/Code/GameEngine/CMakeLists.txt | Removes the duplicate Generals compilation entries while retaining the shared Core target dependency. |
| GeneralsMD/Code/GameEngine/CMakeLists.txt | Removes the duplicate Zero Hour compilation entries while retaining the shared Core target dependency. |
| scripts/cpp/unify_move_files.py | Adds commented records of the eighteen completed file moves without changing script execution. |
| Core/GameEngine/Source/Common/MessageStream.cpp | Moves the shared implementation into Core and removes one behavior-neutral trailing space. |
Flowchart
%%{init: {'theme': 'neutral'}}%%
flowchart LR
Shared["Core GameEngine<br/>nine shared Common pairs"]
G["g_gameengine<br/>RTS_GENERALS"]
Z["z_gameengine<br/>RTS_ZEROHOUR"]
GE["Generals executable and tools"]
ZE["Zero Hour executable and tools"]
Shared -->|INTERFACE sources| G
Shared -->|INTERFACE sources| Z
G --> GE
Z --> ZE
Reviews (1): Last reviewed commit: "unify(common): Move identical files to C..." | Re-trigger Greptile
Skyaero42
approved these changes
Aug 1, 2026
Skyaero42
left a comment
There was a problem hiding this comment.
Validated with winmerge that these files are indeed identical.
xezon
reviewed
Aug 1, 2026
Jaredl-Dev
force-pushed
the
unify/identical-common
branch
from
August 1, 2026 18:40
f046958 to
4da700f
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This moves nine Common header/source pairs shared by Generals and Zero Hour into Core:
The files are code-identical between both games. Seventeen files differ only in the product-name banner inside the opening license comment.
Verification
cmake --workflow --preset vc6cmake --workflow --preset win32