Skip to content

Commit f707fd7

Browse files
Jaredl-DevJaredl-Dev
committed
unify(gui): Move game window files to Core (#3197)
1 parent cd42eee commit f707fd7

18 files changed

Lines changed: 29 additions & 10392 deletions

‎Core/GameEngine/CMakeLists.txt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ set(GAMEENGINE_SRC
142142
Include/Common/XferLoad.h
143143
Include/Common/XferSave.h
144144
Include/GameClient/Anim2D.h
145-
# Include/GameClient/AnimateWindowManager.h
145+
Include/GameClient/AnimateWindowManager.h
146146
# Include/GameClient/CampaignManager.h
147147
Include/GameClient/ChallengeGenerals.h
148148
Include/GameClient/ClientInstance.h
@@ -184,8 +184,8 @@ set(GAMEENGINE_SRC
184184
Include/GameClient/GameText.h
185185
Include/GameClient/GameWindow.h
186186
Include/GameClient/GameWindowGlobal.h
187-
# Include/GameClient/GameWindowID.h
188-
# Include/GameClient/GameWindowManager.h
187+
Include/GameClient/GameWindowID.h
188+
Include/GameClient/GameWindowManager.h
189189
Include/GameClient/GameWindowTransitions.h
190190
Include/GameClient/GlobalLanguage.h
191191
Include/GameClient/GraphDraw.h
@@ -711,7 +711,7 @@ set(GAMEENGINE_SRC
711711
Source/GameClient/GameText.cpp
712712
Source/GameClient/GlobalLanguage.cpp
713713
Source/GameClient/GraphDraw.cpp
714-
# Source/GameClient/GUI/AnimateWindowManager.cpp
714+
Source/GameClient/GUI/AnimateWindowManager.cpp
715715
Source/GameClient/GUI/ChallengeGenerals.cpp
716716
Source/GameClient/GUI/ControlBar/ControlBar.cpp
717717
Source/GameClient/GUI/ControlBar/ControlBarBeacon.cpp
@@ -741,10 +741,10 @@ set(GAMEENGINE_SRC
741741
Source/GameClient/GUI/GameFont.cpp
742742
Source/GameClient/GUI/GameWindow.cpp
743743
Source/GameClient/GUI/GameWindowGlobal.cpp
744-
# Source/GameClient/GUI/GameWindowManager.cpp
745-
# Source/GameClient/GUI/GameWindowManagerScript.cpp
744+
Source/GameClient/GUI/GameWindowManager.cpp
745+
Source/GameClient/GUI/GameWindowManagerScript.cpp
746746
Source/GameClient/GUI/GameWindowTransitions.cpp
747-
# Source/GameClient/GUI/GameWindowTransitionsStyles.cpp
747+
Source/GameClient/GUI/GameWindowTransitionsStyles.cpp
748748
Source/GameClient/GUI/GUICallbacks/ControlBarCallback.cpp
749749
Source/GameClient/GUI/GUICallbacks/ControlBarPopupDescription.cpp
750750
Source/GameClient/GUI/GUICallbacks/Diplomacy.cpp

GeneralsMD/Code/GameEngine/Include/GameClient/AnimateWindowManager.h renamed to Core/GameEngine/Include/GameClient/AnimateWindowManager.h

File renamed without changes.

GeneralsMD/Code/GameEngine/Include/GameClient/GameWindowID.h renamed to Core/GameEngine/Include/GameClient/GameWindowID.h

File renamed without changes.

GeneralsMD/Code/GameEngine/Include/GameClient/GameWindowManager.h renamed to Core/GameEngine/Include/GameClient/GameWindowManager.h

File renamed without changes.

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/AnimateWindowManager.cpp renamed to Core/GameEngine/Source/GameClient/GUI/AnimateWindowManager.cpp

File renamed without changes.

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowManager.cpp renamed to Core/GameEngine/Source/GameClient/GUI/GameWindowManager.cpp

File renamed without changes.

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowManagerScript.cpp renamed to Core/GameEngine/Source/GameClient/GUI/GameWindowManagerScript.cpp

File renamed without changes.

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowTransitionsStyles.cpp renamed to Core/GameEngine/Source/GameClient/GUI/GameWindowTransitionsStyles.cpp

File renamed without changes.

‎Generals/Code/GameEngine/CMakeLists.txt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ set(GAMEENGINE_SRC
129129
# Include/Common/XferLoad.h
130130
# Include/Common/XferSave.h
131131
# Include/GameClient/Anim2D.h
132-
Include/GameClient/AnimateWindowManager.h
132+
# Include/GameClient/AnimateWindowManager.h
133133
# Include/GameClient/ChallengeGenerals.h
134134
Include/GameClient/CampaignManager.h
135135
# Include/GameClient/ClientInstance.h
@@ -171,8 +171,8 @@ set(GAMEENGINE_SRC
171171
# Include/GameClient/GameText.h
172172
# Include/GameClient/GameWindow.h
173173
# Include/GameClient/GameWindowGlobal.h
174-
Include/GameClient/GameWindowID.h
175-
Include/GameClient/GameWindowManager.h
174+
# Include/GameClient/GameWindowID.h
175+
# Include/GameClient/GameWindowManager.h
176176
# Include/GameClient/GameWindowTransitions.h
177177
# Include/GameClient/GlobalLanguage.h
178178
# Include/GameClient/GraphDraw.h
@@ -653,7 +653,7 @@ set(GAMEENGINE_SRC
653653
# Source/GameClient/GameText.cpp
654654
# Source/GameClient/GlobalLanguage.cpp
655655
# Source/GameClient/GraphDraw.cpp
656-
Source/GameClient/GUI/AnimateWindowManager.cpp
656+
# Source/GameClient/GUI/AnimateWindowManager.cpp
657657
# Source/GameClient/GUI/ChallengeGenerals.cpp
658658
# Source/GameClient/GUI/ControlBar/ControlBar.cpp
659659
# Source/GameClient/GUI/ControlBar/ControlBarBeacon.cpp
@@ -683,10 +683,10 @@ set(GAMEENGINE_SRC
683683
# Source/GameClient/GUI/GameFont.cpp
684684
# Source/GameClient/GUI/GameWindow.cpp
685685
# Source/GameClient/GUI/GameWindowGlobal.cpp
686-
Source/GameClient/GUI/GameWindowManager.cpp
687-
Source/GameClient/GUI/GameWindowManagerScript.cpp
686+
# Source/GameClient/GUI/GameWindowManager.cpp
687+
# Source/GameClient/GUI/GameWindowManagerScript.cpp
688688
# Source/GameClient/GUI/GameWindowTransitions.cpp
689-
Source/GameClient/GUI/GameWindowTransitionsStyles.cpp
689+
# Source/GameClient/GUI/GameWindowTransitionsStyles.cpp
690690
# Source/GameClient/GUI/GUICallbacks/ControlBarCallback.cpp
691691
# Source/GameClient/GUI/GUICallbacks/ControlBarPopupDescription.cpp
692692
# Source/GameClient/GUI/GUICallbacks/Diplomacy.cpp

‎Generals/Code/GameEngine/Include/GameClient/AnimateWindowManager.h‎

Lines changed: 0 additions & 235 deletions
This file was deleted.

0 commit comments

Comments
 (0)