Skip to content

Commit 354ef18

Browse files
committed
unify(memory): Move GameMemory files to Core (#1408)
1 parent 2350488 commit 354ef18

File tree

18 files changed

+33
-5057
lines changed

18 files changed

+33
-5057
lines changed

Core/GameEngine/CMakeLists.txt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ set(GAMEENGINE_SRC
4545
Include/Common/GameDefines.h
4646
# Include/Common/GameEngine.h
4747
# Include/Common/GameLOD.h
48-
# Include/Common/GameMemory.h
48+
Include/Common/GameMemory.h
4949
Include/Common/GameMusic.h
5050
Include/Common/GameSounds.h
5151
# Include/Common/GameSpyMiscPreferences.h
@@ -1139,18 +1139,18 @@ set(GAMEENGINE_SRC
11391139
if(RTS_GAMEMEMORY_ENABLE)
11401140
# Uses the original Game Memory implementation.
11411141
list(APPEND GAMEENGINE_SRC
1142-
# Source/Common/System/GameMemory.cpp
1143-
# Source/Common/System/GameMemoryInit.cpp
1144-
# Source/Common/System/GameMemoryInitDMA_Generals.inl
1145-
# Source/Common/System/GameMemoryInitDMA_GeneralsMD.inl
1146-
# Source/Common/System/GameMemoryInitPools_Generals.inl
1147-
# Source/Common/System/GameMemoryInitPools_GeneralsMD.inl
1142+
Source/Common/System/GameMemory.cpp
1143+
Source/Common/System/GameMemoryInit.cpp
1144+
Source/Common/System/GameMemoryInitDMA_Generals.inl
1145+
Source/Common/System/GameMemoryInitDMA_GeneralsMD.inl
1146+
Source/Common/System/GameMemoryInitPools_Generals.inl
1147+
Source/Common/System/GameMemoryInitPools_GeneralsMD.inl
11481148
)
11491149
else()
11501150
# Uses the null implementation when disabled.
11511151
list(APPEND GAMEENGINE_SRC
1152-
# Source/Common/System/GameMemoryNull.cpp
1153-
# Include/Common/GameMemoryNull.h
1152+
Source/Common/System/GameMemoryNull.cpp
1153+
Include/Common/GameMemoryNull.h
11541154
)
11551155
endif()
11561156

0 commit comments

Comments
 (0)