Skip to content

Commit 8c6aade

Browse files
xezonxezon
committed
unify(mouse): Move Mouse files to Core
1 parent d10f3dd commit 8c6aade

23 files changed

Lines changed: 30 additions & 3836 deletions

File tree

‎Core/GameEngine/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ set(GAMEENGINE_SRC
208208
# Include/GameClient/Module/AnimatedParticleSysBoneClientUpdate.h
209209
# Include/GameClient/Module/BeaconClientUpdate.h
210210
# Include/GameClient/Module/SwayClientUpdate.h
211-
# Include/GameClient/Mouse.h
211+
Include/GameClient/Mouse.h
212212
Include/GameClient/ParabolicEase.h
213213
Include/GameClient/ParticleSys.h
214214
# Include/GameClient/PlaceEventTranslator.h
@@ -802,7 +802,7 @@ set(GAMEENGINE_SRC
802802
# Source/GameClient/GUI/WinInstanceData.cpp
803803
# Source/GameClient/InGameUI.cpp
804804
# Source/GameClient/Input/Keyboard.cpp
805-
# Source/GameClient/Input/Mouse.cpp
805+
Source/GameClient/Input/Mouse.cpp
806806
# Source/GameClient/LanguageFilter.cpp
807807
# Source/GameClient/Line2D.cpp
808808
Source/GameClient/MapUtil.cpp

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

File renamed without changes.

GeneralsMD/Code/GameEngine/Source/GameClient/Input/Mouse.cpp renamed to Core/GameEngine/Source/GameClient/Input/Mouse.cpp

File renamed without changes.

‎Core/GameEngineDevice/CMakeLists.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ set(GAMEENGINEDEVICE_SRC
5353
# Include/W3DDevice/GameClient/W3DGUICallbacks.h
5454
# Include/W3DDevice/GameClient/W3DInGameUI.h
5555
# Include/W3DDevice/GameClient/W3DMirror.h
56-
# Include/W3DDevice/GameClient/W3DMouse.h
56+
Include/W3DDevice/GameClient/W3DMouse.h
5757
# Include/W3DDevice/GameClient/W3DParticleSys.h
5858
# Include/W3DDevice/GameClient/W3DPoly.h
5959
# Include/W3DDevice/GameClient/W3DProjectedShadow.h
@@ -87,8 +87,8 @@ set(GAMEENGINEDEVICE_SRC
8787
Include/Win32Device/Common/Win32LocalFile.h
8888
Include/Win32Device/Common/Win32LocalFileSystem.h
8989
# Include/Win32Device/GameClient/Win32DIKeyboard.h
90-
# Include/Win32Device/GameClient/Win32DIMouse.h
91-
# Include/Win32Device/GameClient/Win32Mouse.h
90+
#Include/Win32Device/GameClient/Win32DIMouse.h
91+
Include/Win32Device/GameClient/Win32Mouse.h
9292
Source/MilesAudioDevice/MilesAudioManager.cpp
9393
Source/VideoDevice/Bink/BinkVideoPlayer.cpp
9494
# Source/W3DDevice/Common/System/W3DFunctionLexicon.cpp
@@ -156,7 +156,7 @@ set(GAMEENGINEDEVICE_SRC
156156
# Source/W3DDevice/GameClient/W3DFileSystem.cpp
157157
# Source/W3DDevice/GameClient/W3DGameClient.cpp
158158
# Source/W3DDevice/GameClient/W3DInGameUI.cpp
159-
# Source/W3DDevice/GameClient/W3DMouse.cpp
159+
Source/W3DDevice/GameClient/W3DMouse.cpp
160160
# Source/W3DDevice/GameClient/W3DParticleSys.cpp
161161
# Source/W3DDevice/GameClient/W3DPoly.cpp
162162
Source/W3DDevice/GameClient/W3DPropBuffer.cpp
@@ -189,7 +189,7 @@ set(GAMEENGINEDEVICE_SRC
189189
# Source/Win32Device/Common/Win32OSDisplay.cpp
190190
# Source/Win32Device/GameClient/Win32DIKeyboard.cpp
191191
#Source/Win32Device/GameClient/Win32DIMouse.cpp
192-
# Source/Win32Device/GameClient/Win32Mouse.cpp
192+
Source/Win32Device/GameClient/Win32Mouse.cpp
193193
)
194194

195195
# Add C++ 17 FileSystem implementation for non-VS6 builds

GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DMouse.h renamed to Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DMouse.h

File renamed without changes.

GeneralsMD/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32DIMouse.h renamed to Core/GameEngineDevice/Include/Win32Device/GameClient/Win32DIMouse.h

File renamed without changes.

GeneralsMD/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32Mouse.h renamed to Core/GameEngineDevice/Include/Win32Device/GameClient/Win32Mouse.h

File renamed without changes.

GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DMouse.cpp renamed to Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DMouse.cpp

File renamed without changes.

GeneralsMD/Code/GameEngineDevice/Source/Win32Device/GameClient/Win32DIMouse.cpp renamed to Core/GameEngineDevice/Source/Win32Device/GameClient/Win32DIMouse.cpp

File renamed without changes.

GeneralsMD/Code/GameEngineDevice/Source/Win32Device/GameClient/Win32Mouse.cpp renamed to Core/GameEngineDevice/Source/Win32Device/GameClient/Win32Mouse.cpp

File renamed without changes.

0 commit comments

Comments
 (0)