Skip to content

Commit 3966fa8

Browse files
committed
unify(userpreferences): Move UserPreferences files to Core (TheSuperHackers#2182)
1 parent e7af119 commit 3966fa8

8 files changed

Lines changed: 9 additions & 1142 deletions

File tree

Core/GameEngine/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ set(GAMEENGINE_SRC
132132
# Include/Common/UnitTimings.h
133133
# Include/Common/Upgrade.h
134134
#Include/Common/urllaunch.h # unused
135-
# Include/Common/UserPreferences.h
135+
Include/Common/UserPreferences.h
136136
# Include/Common/version.h
137137
# Include/Common/WellKnownKeys.h
138138
Include/Common/WorkerProcess.h
@@ -688,7 +688,7 @@ set(GAMEENGINE_SRC
688688
# Source/Common/Thing/Thing.cpp
689689
# Source/Common/Thing/ThingFactory.cpp
690690
# Source/Common/Thing/ThingTemplate.cpp
691-
# Source/Common/UserPreferences.cpp
691+
Source/Common/UserPreferences.cpp
692692
# Source/Common/version.cpp
693693
Source/Common/WorkerProcess.cpp
694694
# Source/GameClient/ClientInstance.cpp

GeneralsMD/Code/GameEngine/Include/Common/UserPreferences.h renamed to Core/GameEngine/Include/Common/UserPreferences.h

File renamed without changes.

GeneralsMD/Code/GameEngine/Source/Common/UserPreferences.cpp renamed to Core/GameEngine/Source/Common/UserPreferences.cpp

File renamed without changes.

Generals/Code/GameEngine/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ set(GAMEENGINE_SRC
121121
# Include/Common/UnicodeString.h
122122
Include/Common/UnitTimings.h
123123
Include/Common/Upgrade.h
124-
Include/Common/UserPreferences.h
124+
# Include/Common/UserPreferences.h
125125
Include/Common/version.h
126126
Include/Common/WellKnownKeys.h
127127
# Include/Common/WorkerProcess.h
@@ -636,7 +636,7 @@ set(GAMEENGINE_SRC
636636
Source/Common/Thing/Thing.cpp
637637
Source/Common/Thing/ThingFactory.cpp
638638
Source/Common/Thing/ThingTemplate.cpp
639-
Source/Common/UserPreferences.cpp
639+
# Source/Common/UserPreferences.cpp
640640
Source/Common/version.cpp
641641
# Source/Common/WorkerProcess.cpp
642642
Source/GameClient/ClientInstance.cpp

Generals/Code/GameEngine/Include/Common/UserPreferences.h

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

0 commit comments

Comments
 (0)