Skip to content

unify(memory): Merge and move GameMemory files to Core #1383

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

Closed
xezon wants to merge 2 commits into from
Closed

unify(memory): Merge and move GameMemory files to Core #1383

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
c766459
unify(memory): Merge GameMemory code (#1383)
xezon Jul 29, 2025
2c17a7a
unify(memory): Move GameMemory files to Core (#1383)
xezon Jul 29, 2025
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
10 changes: 5 additions & 5 deletions Core/GameEngine/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ set(GAMEENGINE_SRC
Include/Common/GameDefines.h
# Include/Common/GameEngine.h
# Include/Common/GameLOD.h
# Include/Common/GameMemory.h
Include/Common/GameMemory.h
Include/Common/GameMusic.h
Include/Common/GameSounds.h
# Include/Common/GameSpyMiscPreferences.h
Expand Down Expand Up @@ -1139,14 +1139,14 @@ set(GAMEENGINE_SRC
if(RTS_GAMEMEMORY_ENABLE)
# Uses the original Game Memory implementation.
list(APPEND GAMEENGINE_SRC
# Source/Common/System/GameMemory.cpp
# Source/Common/System/MemoryInit.cpp
Source/Common/System/GameMemory.cpp
Source/Common/System/MemoryInit.cpp
)
else()
# Uses the null implementation when disabled.
list(APPEND GAMEENGINE_SRC
# Source/Common/System/GameMemoryNull.cpp
# Include/Common/GameMemoryNull.h
Source/Common/System/GameMemoryNull.cpp
Include/Common/GameMemoryNull.h
)
endif()

Expand Down
8 changes: 8 additions & 0 deletions Core/GameEngine/Include/Common/GameDefines.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,3 +59,11 @@
#ifndef ENABLE_FILESYSTEM_EXISTENCE_CACHE
#define ENABLE_FILESYSTEM_EXISTENCE_CACHE (1)
#endif

// Enable obsolete code. This mainly refers to code that existed in Generals but was removed in GeneralsMD.
// Disable and remove this when Generals and GeneralsMD are merged.
#if RTS_GENERALS
#ifndef USE_OBSOLETE_GENERALS_CODE
#define USE_OBSOLETE_GENERALS_CODE (1)
#endif
#endif
0 ...de/GameEngine/Include/Common/GameMemory.h → Core/GameEngine/Include/Common/GameMemory.h
View file
Open in desktop
File renamed without changes.
0 ...ameEngine/Include/Common/GameMemoryNull.h → ...ameEngine/Include/Common/GameMemoryNull.h
View file
Open in desktop
File renamed without changes.
0 ...ngine/Source/Common/System/GameMemory.cpp → ...ngine/Source/Common/System/GameMemory.cpp
View file
Open in desktop
File renamed without changes.
0 ...e/Source/Common/System/GameMemoryNull.cpp → ...e/Source/Common/System/GameMemoryNull.cpp
View file
Open in desktop
File renamed without changes.
8 changes: 6 additions & 2 deletions ...ngine/Source/Common/System/MemoryInit.cpp → ...ngine/Source/Common/System/MemoryInit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,10 @@ static PoolSizeRec sizes[] =
{ "EjectPilotDie", 1024, 32 },
{ "CrushDie", 1024, 32 },
{ "DamDie", 8, 8 },
#if USE_OBSOLETE_GENERALS_CODE
{ "DelayedUpgrade", 32, 32 },
{ "DelayedWeaponSetUpgradeUpdate", 32, 32 },
#endif
{ "DeliverPayloadStateMachine", 32, 32 },
{ "DeliverPayloadAIUpdate", 32, 32 },
{ "DeletionUpdate", 128, 32 },
Expand Down Expand Up @@ -218,7 +222,7 @@ static PoolSizeRec sizes[] =
{ "PrisonBehavior", 32, 32 },
{ "PrisonVisual", 32, 32 },
{ "PropagandaCenterBehavior", 16, 16 },
#endif
#endif
{ "PropagandaTowerBehavior", 16, 16 },
{ "BunkerBusterBehavior", 16, 16 },
{ "ObjectTracker", 128, 32 },
Expand Down Expand Up @@ -659,7 +663,7 @@ static PoolSizeRec sizes[] =
{ "HTreeClass", 2048, 512 },
{ "HLodClass", 2048, 512 },
{ "MeshModelClass", 8192, 32 },
{ "ShareBufferClass", 32768, 1024 },
{ "ShareBufferClass", 32768, 1024 },
{ "AABTreeClass", 300, 128 },
{ "MotionChannelClass", 16384, 32 },
{ "BitChannelClass", 84, 32 },
Expand Down
10 changes: 5 additions & 5 deletions Generals/Code/GameEngine/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ set(GAMEENGINE_SRC
# Include/Common/GameDefines.h
Include/Common/GameEngine.h
Include/Common/GameLOD.h
Include/Common/GameMemory.h
# Include/Common/GameMemory.h
# Include/Common/GameMusic.h
# Include/Common/GameSounds.h
Include/Common/GameSpyMiscPreferences.h
Expand Down Expand Up @@ -1060,14 +1060,14 @@ set(GAMEENGINE_SRC
if(RTS_GAMEMEMORY_ENABLE)
# Uses the original Game Memory implementation.
list(APPEND GAMEENGINE_SRC
Source/Common/System/GameMemory.cpp
Source/Common/System/MemoryInit.cpp
# Source/Common/System/GameMemory.cpp
# Source/Common/System/MemoryInit.cpp
)
else()
# Uses the null implementation when disabled.
list(APPEND GAMEENGINE_SRC
Source/Common/System/GameMemoryNull.cpp
Include/Common/GameMemoryNull.h
# Source/Common/System/GameMemoryNull.cpp
# Include/Common/GameMemoryNull.h
)
endif()

Expand Down
Loading
Loading