unify(commandline): Move CommandLine to Core - #3037
Conversation
|
| Filename | Overview |
|---|---|
| Core/GameEngine/CMakeLists.txt | Registers the unified command-line header and implementation in the shared GameEngine interface source set. |
| Core/GameEngine/Include/Common/CommandLine.h | Relocates the unchanged command-line interface into Core. |
| Core/GameEngine/Source/Common/CommandLine.cpp | Relocates the unchanged command-line implementation so each game target compiles the shared source. |
| Generals/Code/GameEngine/CMakeLists.txt | Removes the Generals-local command-line files from its source list in favor of Core. |
| GeneralsMD/Code/GameEngine/CMakeLists.txt | Removes the Zero Hour-local command-line files from its source list in favor of Core. |
| scripts/cpp/unify_move_files.py | Documents the completed unification operations as disabled helper calls. |
Flowchart
%%{init: {'theme': 'neutral'}}%%
flowchart LR
Core["Core CommandLine sources"]
Generals["Generals GameEngine target"]
ZeroHour["Zero Hour GameEngine target"]
Core --> Generals
Core --> ZeroHour
Reviews (2): Last reviewed commit: "unify(commandline): Move CommandLine to ..." | Re-trigger Greptile
e2e3a2a to
5957101
Compare
Skyaero42
left a comment
There was a problem hiding this comment.
Validated with winmerge that these commandline is indeed equal in both games.
xezon
left a comment
There was a problem hiding this comment.
This change moves Generals to Core. It should always move GeneralsMD to Core. It looks like the error is that Generals has a Zero Hour header.
The script did move the GeneralsMD files, but GitHub matched the identical Generals files instead. I’ll fix the incorrect Generals banner in a separate PR, then rebase this one once it’s merged. Should the unify script be updated to account for byte-identical files like this? I could add a small warning to it to help avoid instances like this? |
|
Yes you can do that if you like. Edit: Maybe is not needed. CommandLine files were the only offender. |
0fc4bb7 to
af31cef
Compare
I have updated this pull request. |
af31cef to
28fca0b
Compare
This moves
CommandLine.handCommandLine.cpp, shared by Generals and Zero Hour, into Core.Both files are byte-identical between the two games.
Verification
cmake --workflow --preset vc6cmake --workflow --preset win32