Skip to content

[CORE] Unify File System code and move files to Core #1279

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.

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

Merged
merged 2 commits into from
Jul 16, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion Core/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,15 @@ add_library(corei_gameengine_include INTERFACE)
add_library(corei_libraries_include INTERFACE)
add_library(corei_libraries_source_wwvegas INTERFACE)
add_library(corei_libraries_source_wwvegas_wwlib INTERFACE)
add_library(corei_main INTERFACE)
add_library(corei_always INTERFACE)

target_include_directories(corei_gameengine_include INTERFACE "GameEngine/Include")
target_include_directories(corei_libraries_include INTERFACE "Libraries/Include")
target_include_directories(corei_libraries_source_wwvegas INTERFACE "Libraries/Source/WWVegas")
target_include_directories(corei_libraries_source_wwvegas_wwlib INTERFACE "Libraries/Source/WWVegas/WWLib")
target_include_directories(corei_main INTERFACE "Main")

target_link_libraries(corei_always INTERFACE
core_utility
corei_libraries_include
Expand All @@ -24,6 +27,6 @@ add_subdirectory(Libraries)
add_subdirectory(GameEngine)

# Platform specific GameEngine code
# add_subdirectory(GameEngineDevice)
add_subdirectory(GameEngineDevice)

add_subdirectory(Tools)
32 changes: 16 additions & 16 deletions Core/GameEngine/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
set(GAMEENGINE_SRC
# Include/Common/AcademyStats.h
# Include/Common/ActionManager.h
# Include/Common/ArchiveFile.h
# Include/Common/ArchiveFileSystem.h
Include/Common/ArchiveFile.h
Include/Common/ArchiveFileSystem.h
# Include/Common/AsciiString.h
# Include/Common/AudioAffect.h
# Include/Common/AudioEventInfo.h
Expand Down Expand Up @@ -37,8 +37,8 @@ set(GAMEENGINE_SRC
# Include/Common/encrypt.h
# Include/Common/Energy.h
# Include/Common/Errors.h
# Include/Common/file.h
# Include/Common/FileSystem.h
Include/Common/file.h
Include/Common/FileSystem.h
# Include/Common/FunctionLexicon.h
# Include/Common/GameAudio.h
# Include/Common/GameCommon.h
Expand All @@ -63,8 +63,8 @@ set(GAMEENGINE_SRC
# Include/Common/Language.h
# Include/Common/LatchRestore.h
# Include/Common/List.h
# Include/Common/LocalFile.h
# Include/Common/LocalFileSystem.h
Include/Common/LocalFile.h
Include/Common/LocalFileSystem.h
# Include/Common/MapObject.h
# Include/Common/MapReaderWriterInfo.h
# Include/Common/MessageStream.h
Expand All @@ -91,7 +91,7 @@ set(GAMEENGINE_SRC
# Include/Common/QuickmatchPreferences.h
# Include/Common/QuotedPrintable.h
# Include/Common/Radar.h
# Include/Common/RAMFile.h
Include/Common/RAMFile.h
# Include/Common/RandomValue.h
# Include/Common/Recorder.h
# Include/Common/Registry.h
Expand All @@ -113,7 +113,7 @@ set(GAMEENGINE_SRC
# Include/Common/StatsCollector.h
# Include/Common/STLTypedefs.h
Include/Common/STLUtils.h
# Include/Common/StreamingArchiveFile.h
Include/Common/StreamingArchiveFile.h
# Include/Common/SubsystemInterface.h
# Include/Common/SystemInfo.h
# Include/Common/Team.h
Expand Down Expand Up @@ -630,8 +630,8 @@ set(GAMEENGINE_SRC
# Source/Common/SkirmishBattleHonors.cpp
# Source/Common/StateMachine.cpp
# Source/Common/StatsCollector.cpp
# Source/Common/System/ArchiveFile.cpp
# Source/Common/System/ArchiveFileSystem.cpp
Source/Common/System/ArchiveFile.cpp
Source/Common/System/ArchiveFileSystem.cpp
# Source/Common/System/AsciiString.cpp
# Source/Common/System/BuildAssistant.cpp
# Source/Common/System/CDManager.cpp
Expand All @@ -641,28 +641,28 @@ set(GAMEENGINE_SRC
# Source/Common/System/Directory.cpp
# Source/Common/System/DisabledTypes.cpp
# Source/Common/System/encrypt.cpp
# Source/Common/System/File.cpp
# Source/Common/System/FileSystem.cpp
Source/Common/System/File.cpp
Source/Common/System/FileSystem.cpp
# Source/Common/System/FunctionLexicon.cpp
# Source/Common/System/GameCommon.cpp
#Source/Common/System/GameMemory.cpp # is conditionally appended
# Source/Common/System/GameType.cpp
# Source/Common/System/Geometry.cpp
# Source/Common/System/KindOf.cpp
# Source/Common/System/List.cpp
# Source/Common/System/LocalFile.cpp
# Source/Common/System/LocalFileSystem.cpp
Source/Common/System/LocalFile.cpp
Source/Common/System/LocalFileSystem.cpp
#Source/Common/System/MemoryInit.cpp # is conditionally appended
# Source/Common/System/ObjectStatusTypes.cpp
# Source/Common/System/QuotedPrintable.cpp
# Source/Common/System/Radar.cpp
# Source/Common/System/RAMFile.cpp
Source/Common/System/RAMFile.cpp
# Source/Common/System/registry.cpp
# Source/Common/System/SaveGame/GameState.cpp
# Source/Common/System/SaveGame/GameStateMap.cpp
# Source/Common/System/Snapshot.cpp
# Source/Common/System/StackDump.cpp
# Source/Common/System/StreamingArchiveFile.cpp
Source/Common/System/StreamingArchiveFile.cpp
# Source/Common/System/SubsystemInterface.cpp
# Source/Common/System/Trig.cpp
# Source/Common/System/UnicodeString.cpp
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ Bool FileSystem::createDirectory(AsciiString directory)
Bool FileSystem::areMusicFilesOnCD()
{
#if 1
return TRUE;
return TRUE;
#else
if (!TheCDManager) {
DEBUG_LOG(("FileSystem::areMusicFilesOnCD() - No CD Manager; returning false"));
Expand All @@ -291,7 +291,11 @@ Bool FileSystem::areMusicFilesOnCD()
cdRoot = cdi->getPath();
if (!cdRoot.endsWith("\\"))
cdRoot.concat("\\");
#if RTS_GENERALS
cdRoot.concat("gensec.big");
#elif RTS_ZEROHOUR
cdRoot.concat("genseczh.big");
#endif
DEBUG_LOG(("FileSystem::areMusicFilesOnCD() - checking for %s", cdRoot.str()));
File *musicBig = TheLocalFileSystem->openFile(cdRoot.str());
if (musicBig)
Expand Down
248 changes: 248 additions & 0 deletions Core/GameEngineDevice/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,248 @@
set(GAMEENGINEDEVICE_SRC
# Include/MilesAudioDevice/MilesAudioManager.h
# Include/VideoDevice/Bink/BinkVideoPlayer.h
# Include/W3DDevice/Common/W3DConvert.h
# Include/W3DDevice/Common/W3DFunctionLexicon.h
# Include/W3DDevice/Common/W3DModuleFactory.h
# Include/W3DDevice/Common/W3DRadar.h
# Include/W3DDevice/Common/W3DThingFactory.h
# Include/W3DDevice/GameClient/BaseHeightMap.h
# Include/W3DDevice/GameClient/camerashakesystem.h
# Include/W3DDevice/GameClient/FlatHeightMap.h
# Include/W3DDevice/GameClient/HeightMap.h
# Include/W3DDevice/GameClient/Module/W3DDebrisDraw.h
# Include/W3DDevice/GameClient/Module/W3DDefaultDraw.h
# Include/W3DDevice/GameClient/Module/W3DDependencyModelDraw.h
# Include/W3DDevice/GameClient/Module/W3DLaserDraw.h
# Include/W3DDevice/GameClient/Module/W3DModelDraw.h
# Include/W3DDevice/GameClient/Module/W3DOverlordAircraftDraw.h
# Include/W3DDevice/GameClient/Module/W3DOverlordTankDraw.h
# Include/W3DDevice/GameClient/Module/W3DOverlordTruckDraw.h
# Include/W3DDevice/GameClient/Module/W3DPoliceCarDraw.h
# Include/W3DDevice/GameClient/Module/W3DProjectileStreamDraw.h
# Include/W3DDevice/GameClient/Module/W3DPropDraw.h
# Include/W3DDevice/GameClient/Module/W3DRopeDraw.h
# Include/W3DDevice/GameClient/Module/W3DScienceModelDraw.h
# Include/W3DDevice/GameClient/Module/W3DSupplyDraw.h
# Include/W3DDevice/GameClient/Module/W3DTankDraw.h
# Include/W3DDevice/GameClient/Module/W3DTankTruckDraw.h
# Include/W3DDevice/GameClient/Module/W3DTracerDraw.h
# Include/W3DDevice/GameClient/Module/W3DTreeDraw.h
# Include/W3DDevice/GameClient/Module/W3DTruckDraw.h
# Include/W3DDevice/GameClient/TerrainTex.h
# Include/W3DDevice/GameClient/TileData.h
# Include/W3DDevice/GameClient/W3DAssetManager.h
# Include/W3DDevice/GameClient/W3DAssetManagerExposed.h
# Include/W3DDevice/GameClient/W3DBibBuffer.h
# Include/W3DDevice/GameClient/W3DBridgeBuffer.h
# Include/W3DDevice/GameClient/W3DBufferManager.h
# Include/W3DDevice/GameClient/W3DCustomEdging.h
# Include/W3DDevice/GameClient/W3DCustomScene.h
# Include/W3DDevice/GameClient/W3DDebugDisplay.h
# Include/W3DDevice/GameClient/W3DDebugIcons.h
# Include/W3DDevice/GameClient/W3DDisplay.h
# Include/W3DDevice/GameClient/W3DDisplayString.h
# Include/W3DDevice/GameClient/W3DDisplayStringManager.h
# Include/W3DDevice/GameClient/W3DDynamicLight.h
# Include/W3DDevice/GameClient/W3DFileSystem.h
# Include/W3DDevice/GameClient/W3DGadget.h
# Include/W3DDevice/GameClient/W3DGameClient.h
# Include/W3DDevice/GameClient/W3DGameFont.h
# Include/W3DDevice/GameClient/W3DGameWindow.h
# Include/W3DDevice/GameClient/W3DGameWindowManager.h
# Include/W3DDevice/GameClient/W3DGUICallbacks.h
# Include/W3DDevice/GameClient/W3DInGameUI.h
# Include/W3DDevice/GameClient/W3DMirror.h
# Include/W3DDevice/GameClient/W3DMouse.h
# Include/W3DDevice/GameClient/W3DParticleSys.h
# Include/W3DDevice/GameClient/W3DPoly.h
# Include/W3DDevice/GameClient/W3DProjectedShadow.h
# Include/W3DDevice/GameClient/W3DPropBuffer.h
# Include/W3DDevice/GameClient/W3DRoadBuffer.h
# Include/W3DDevice/GameClient/W3DScene.h
# Include/W3DDevice/GameClient/W3DShaderManager.h
# Include/W3DDevice/GameClient/W3DShadow.h
# Include/W3DDevice/GameClient/W3DShroud.h
# Include/W3DDevice/GameClient/W3DSmudge.h
# Include/W3DDevice/GameClient/W3DSnow.h
# Include/W3DDevice/GameClient/W3DStatusCircle.h
# Include/W3DDevice/GameClient/W3DTerrainBackground.h
# Include/W3DDevice/GameClient/W3DTerrainTracks.h
# Include/W3DDevice/GameClient/W3DTerrainVisual.h
# Include/W3DDevice/GameClient/W3DTreeBuffer.h
# Include/W3DDevice/GameClient/W3DVideobuffer.h
# Include/W3DDevice/GameClient/W3DView.h
# Include/W3DDevice/GameClient/W3DVolumetricShadow.h
# Include/W3DDevice/GameClient/W3DWater.h
# Include/W3DDevice/GameClient/W3DWaterTracks.h
# Include/W3DDevice/GameClient/W3DWaypointBuffer.h
# Include/W3DDevice/GameClient/W3DWebBrowser.h
# Include/W3DDevice/GameClient/WorldHeightMap.h
# Include/W3DDevice/GameLogic/W3DGameLogic.h
# Include/W3DDevice/GameLogic/W3DGhostObject.h
# Include/W3DDevice/GameLogic/W3DTerrainLogic.h
Include/Win32Device/Common/Win32BIGFile.h
Include/Win32Device/Common/Win32BIGFileSystem.h
# Include/Win32Device/Common/Win32CDManager.h
# Include/Win32Device/Common/Win32GameEngine.h
Include/Win32Device/Common/Win32LocalFile.h
Include/Win32Device/Common/Win32LocalFileSystem.h
# Include/Win32Device/GameClient/Win32DIKeyboard.h
# Include/Win32Device/GameClient/Win32DIMouse.h
# Include/Win32Device/GameClient/Win32Mouse.h
# Source/MilesAudioDevice/MilesAudioManager.cpp
# Source/VideoDevice/Bink/BinkVideoPlayer.cpp
# Source/W3DDevice/Common/System/W3DFunctionLexicon.cpp
# Source/W3DDevice/Common/System/W3DRadar.cpp
# Source/W3DDevice/Common/Thing/W3DModuleFactory.cpp
# Source/W3DDevice/Common/Thing/W3DThingFactory.cpp
# Source/W3DDevice/Common/W3DConvert.cpp
# Source/W3DDevice/GameClient/BaseHeightMap.cpp
# Source/W3DDevice/GameClient/camerashakesystem.cpp
# Source/W3DDevice/GameClient/Drawable/Draw/W3DDebrisDraw.cpp
# Source/W3DDevice/GameClient/Drawable/Draw/W3DDefaultDraw.cpp
# Source/W3DDevice/GameClient/Drawable/Draw/W3DDependencyModelDraw.cpp
# Source/W3DDevice/GameClient/Drawable/Draw/W3DLaserDraw.cpp
# Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp
# Source/W3DDevice/GameClient/Drawable/Draw/W3DOverlordAircraftDraw.cpp
# Source/W3DDevice/GameClient/Drawable/Draw/W3DOverlordTankDraw.cpp
# Source/W3DDevice/GameClient/Drawable/Draw/W3DOverlordTruckDraw.cpp
# Source/W3DDevice/GameClient/Drawable/Draw/W3DPoliceCarDraw.cpp
# Source/W3DDevice/GameClient/Drawable/Draw/W3DProjectileStreamDraw.cpp
# Source/W3DDevice/GameClient/Drawable/Draw/W3DPropDraw.cpp
# Source/W3DDevice/GameClient/Drawable/Draw/W3DRopeDraw.cpp
# Source/W3DDevice/GameClient/Drawable/Draw/W3DScienceModelDraw.cpp
# Source/W3DDevice/GameClient/Drawable/Draw/W3DSupplyDraw.cpp
# Source/W3DDevice/GameClient/Drawable/Draw/W3DTankDraw.cpp
# Source/W3DDevice/GameClient/Drawable/Draw/W3DTankTruckDraw.cpp
# Source/W3DDevice/GameClient/Drawable/Draw/W3DTracerDraw.cpp
# Source/W3DDevice/GameClient/Drawable/Draw/W3DTreeDraw.cpp
# Source/W3DDevice/GameClient/Drawable/Draw/W3DTruckDraw.cpp
# Source/W3DDevice/GameClient/FlatHeightMap.cpp
# Source/W3DDevice/GameClient/GUI/Gadget/W3DCheckBox.cpp
# Source/W3DDevice/GameClient/GUI/Gadget/W3DComboBox.cpp
# Source/W3DDevice/GameClient/GUI/Gadget/W3DHorizontalSlider.cpp
# Source/W3DDevice/GameClient/GUI/Gadget/W3DListBox.cpp
# Source/W3DDevice/GameClient/GUI/Gadget/W3DProgressBar.cpp
# Source/W3DDevice/GameClient/GUI/Gadget/W3DPushButton.cpp
# Source/W3DDevice/GameClient/GUI/Gadget/W3DRadioButton.cpp
# Source/W3DDevice/GameClient/GUI/Gadget/W3DStaticText.cpp
# Source/W3DDevice/GameClient/GUI/Gadget/W3DTabControl.cpp
# Source/W3DDevice/GameClient/GUI/Gadget/W3DTextEntry.cpp
# Source/W3DDevice/GameClient/GUI/Gadget/W3DVerticalSlider.cpp
# Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DControlBar.cpp
# Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DMainMenu.cpp
# Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DMOTD.cpp
# Source/W3DDevice/GameClient/GUI/W3DGameFont.cpp
# Source/W3DDevice/GameClient/GUI/W3DGameWindow.cpp
# Source/W3DDevice/GameClient/GUI/W3DGameWindowManager.cpp
# Source/W3DDevice/GameClient/HeightMap.cpp
# Source/W3DDevice/GameClient/Shadow/W3DBufferManager.cpp
# Source/W3DDevice/GameClient/Shadow/W3DProjectedShadow.cpp
# Source/W3DDevice/GameClient/Shadow/W3DShadow.cpp
# Source/W3DDevice/GameClient/Shadow/W3DVolumetricShadow.cpp
# Source/W3DDevice/GameClient/TerrainTex.cpp
# Source/W3DDevice/GameClient/TileData.cpp
# Source/W3DDevice/GameClient/W3DAssetManager.cpp
# Source/W3DDevice/GameClient/W3DAssetManagerExposed.cpp
# Source/W3DDevice/GameClient/W3DBibBuffer.cpp
# Source/W3DDevice/GameClient/W3DBridgeBuffer.cpp
# Source/W3DDevice/GameClient/W3DCustomEdging.cpp
# Source/W3DDevice/GameClient/W3DDebugDisplay.cpp
# Source/W3DDevice/GameClient/W3DDebugIcons.cpp
# Source/W3DDevice/GameClient/W3DDisplay.cpp
# Source/W3DDevice/GameClient/W3DDisplayString.cpp
# Source/W3DDevice/GameClient/W3DDisplayStringManager.cpp
# Source/W3DDevice/GameClient/W3DDynamicLight.cpp
# Source/W3DDevice/GameClient/W3DFileSystem.cpp
# Source/W3DDevice/GameClient/W3DGameClient.cpp
# Source/W3DDevice/GameClient/W3DInGameUI.cpp
# Source/W3DDevice/GameClient/W3DMouse.cpp
# Source/W3DDevice/GameClient/W3DParticleSys.cpp
# Source/W3DDevice/GameClient/W3DPoly.cpp
# Source/W3DDevice/GameClient/W3DPropBuffer.cpp
# Source/W3DDevice/GameClient/W3DRoadBuffer.cpp
# Source/W3DDevice/GameClient/W3DScene.cpp
# Source/W3DDevice/GameClient/W3DShaderManager.cpp
# Source/W3DDevice/GameClient/W3DShroud.cpp
# Source/W3DDevice/GameClient/W3DSmudge.cpp
# Source/W3DDevice/GameClient/W3DSnow.cpp
# Source/W3DDevice/GameClient/W3DStatusCircle.cpp
# Source/W3DDevice/GameClient/W3DTerrainBackground.cpp
# Source/W3DDevice/GameClient/W3DTerrainTracks.cpp
# Source/W3DDevice/GameClient/W3DTerrainVisual.cpp
# Source/W3DDevice/GameClient/W3DTreeBuffer.cpp
# Source/W3DDevice/GameClient/W3DVideoBuffer.cpp
# Source/W3DDevice/GameClient/W3DView.cpp
# Source/W3DDevice/GameClient/W3dWaypointBuffer.cpp
# Source/W3DDevice/GameClient/W3DWebBrowser.cpp
# Source/W3DDevice/GameClient/Water/W3DWater.cpp
# Source/W3DDevice/GameClient/Water/W3DWaterTracks.cpp
# Source/W3DDevice/GameClient/WorldHeightMap.cpp
# Source/W3DDevice/GameLogic/W3DGameLogic.cpp
# Source/W3DDevice/GameLogic/W3DGhostObject.cpp
# Source/W3DDevice/GameLogic/W3DTerrainLogic.cpp
Source/Win32Device/Common/Win32BIGFile.cpp
Source/Win32Device/Common/Win32BIGFileSystem.cpp
# Source/Win32Device/Common/Win32CDManager.cpp
# Source/Win32Device/Common/Win32GameEngine.cpp
Source/Win32Device/Common/Win32LocalFile.cpp
Source/Win32Device/Common/Win32LocalFileSystem.cpp
# Source/Win32Device/Common/Win32OSDisplay.cpp
# Source/Win32Device/GameClient/Win32DIKeyboard.cpp
#Source/Win32Device/GameClient/Win32DIMouse.cpp
# Source/Win32Device/GameClient/Win32Mouse.cpp
)

# Add C++ 17 FileSystem implementation for non-VS6 builds
if(NOT IS_VS6_BUILD)
list(APPEND GAMEENGINEDEVICE_SRC
Include/StdDevice/Common/StdBIGFile.h
Include/StdDevice/Common/StdBIGFileSystem.h
Include/StdDevice/Common/StdLocalFile.h
Include/StdDevice/Common/StdLocalFileSystem.h
Source/StdDevice/Common/StdBIGFile.cpp
Source/StdDevice/Common/StdBIGFileSystem.cpp
Source/StdDevice/Common/StdLocalFile.cpp
Source/StdDevice/Common/StdLocalFileSystem.cpp
)
endif()

add_library(corei_gameenginedevice_private INTERFACE)
add_library(corei_gameenginedevice_public INTERFACE)

target_sources(corei_gameenginedevice_private INTERFACE ${GAMEENGINEDEVICE_SRC})

target_include_directories(corei_gameenginedevice_public INTERFACE
Include
)

target_link_libraries(corei_gameenginedevice_private INTERFACE
corei_always
corei_main
)

target_link_libraries(corei_gameenginedevice_public INTERFACE
binkstub
corei_gameengine_public
d3d8lib
milesstub
)

#if(RTS_BUILD_OPTION_FFMPEG)
# find_package(FFMPEG REQUIRED)
#
# if(FFMPEG_FOUND)
# target_sources(z_gameenginedevice PRIVATE
# Include/VideoDevice/FFmpeg/FFmpegFile.h
# Include/VideoDevice/FFmpeg/FFmpegVideoPlayer.h
# Source/VideoDevice/FFmpeg/FFmpegFile.cpp
# Source/VideoDevice/FFmpeg/FFmpegVideoPlayer.cpp
# )
#
# target_include_directories(z_gameenginedevice PRIVATE ${FFMPEG_INCLUDE_DIRS})
# target_link_directories(z_gameenginedevice PRIVATE ${FFMPEG_LIBRARY_DIRS})
# target_link_libraries(z_gameenginedevice PRIVATE ${FFMPEG_LIBRARIES})
# target_compile_definitions(z_gameenginedevice PUBLIC RTS_HAS_FFMPEG)
# endif()
#endif()
Loading
Loading