Skip to content

unify(shell): Move Shell to Core #3070

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
Jaredl-Dev wants to merge 2 commits into
base: main
Choose a base branch
from
Open

unify(shell): Move Shell to Core #3070

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
1ceddfe
unify(shell): Merge Shell from Zero Hour (#3070)
Jaredl-Dev Aug 7, 2026
eae98b1
unify(shell): Move Shell to Core (#3070)
Jaredl-Dev Aug 7, 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
9 changes: 5 additions & 4 deletions Core/GameEngine/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,9 +220,9 @@ set(GAMEENGINE_SRC
Include/GameClient/SelectionInfo.h
Include/GameClient/SelectionXlat.h
# Include/GameClient/Shadow.h
# Include/GameClient/Shell.h
Include/GameClient/Shell.h
# Include/GameClient/ShellHooks.h
# Include/GameClient/ShellMenuScheme.h
Include/GameClient/ShellMenuScheme.h
Include/GameClient/Smudge.h
Include/GameClient/Snow.h
Include/GameClient/Statistics.h
Expand Down Expand Up @@ -799,8 +799,8 @@ set(GAMEENGINE_SRC
Source/GameClient/GUI/IMEManager.cpp
Source/GameClient/GUI/LoadScreen.cpp
Source/GameClient/GUI/ProcessAnimateWindow.cpp
# Source/GameClient/GUI/Shell/Shell.cpp
# Source/GameClient/GUI/Shell/ShellMenuScheme.cpp
Source/GameClient/GUI/Shell/Shell.cpp
Source/GameClient/GUI/Shell/ShellMenuScheme.cpp
Source/GameClient/GUI/WindowLayout.cpp
Source/GameClient/GUI/WindowVideoManager.cpp
Source/GameClient/GUI/WinInstanceData.cpp
Expand Down Expand Up @@ -1179,6 +1179,7 @@ target_include_directories(corei_gameengine_private INTERFACE

target_link_libraries(corei_gameengine_private INTERFACE
corei_always
core_profile_legacy
)

target_compile_definitions(corei_gameengine_private INTERFACE
Expand Down
0 ...ode/GameEngine/Include/GameClient/Shell.h → Core/GameEngine/Include/GameClient/Shell.h
View file
Open in desktop
File renamed without changes.
0 ...gine/Include/GameClient/ShellMenuScheme.h → ...gine/Include/GameClient/ShellMenuScheme.h
View file
Open in desktop
File renamed without changes.
0 ...ine/Source/GameClient/GUI/Shell/Shell.cpp → ...ine/Source/GameClient/GUI/Shell/Shell.cpp
View file
Open in desktop
File renamed without changes.
0 .../GameClient/GUI/Shell/ShellMenuScheme.cpp → .../GameClient/GUI/Shell/ShellMenuScheme.cpp
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions Core/Libraries/Source/profile/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ target_precompile_headers(core_profile_legacy PRIVATE
)

target_link_libraries(core_profile_legacy PRIVATE
core_debug
core_wwcommon
corei_always
)
8 changes: 4 additions & 4 deletions Generals/Code/GameEngine/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,9 +205,9 @@ set(GAMEENGINE_SRC
# Include/GameClient/SelectionInfo.h
# Include/GameClient/SelectionXlat.h
Include/GameClient/Shadow.h
Include/GameClient/Shell.h
# Include/GameClient/Shell.h
Include/GameClient/ShellHooks.h
Include/GameClient/ShellMenuScheme.h
# Include/GameClient/ShellMenuScheme.h
# Include/GameClient/Statistics.h
# Include/GameClient/TerrainRoads.h
# Include/GameClient/TerrainVisual.h
Expand Down Expand Up @@ -741,8 +741,8 @@ set(GAMEENGINE_SRC
# Source/GameClient/GUI/IMEManager.cpp
# Source/GameClient/GUI/LoadScreen.cpp
# Source/GameClient/GUI/ProcessAnimateWindow.cpp
Source/GameClient/GUI/Shell/Shell.cpp
Source/GameClient/GUI/Shell/ShellMenuScheme.cpp
# Source/GameClient/GUI/Shell/Shell.cpp
# Source/GameClient/GUI/Shell/ShellMenuScheme.cpp
# Source/GameClient/GUI/WindowLayout.cpp
# Source/GameClient/GUI/WindowVideoManager.cpp
# Source/GameClient/GUI/WinInstanceData.cpp
Expand Down
205 changes: 0 additions & 205 deletions Generals/Code/GameEngine/Include/GameClient/Shell.h
View file
Open in desktop

This file was deleted.

Loading
Loading