Skip to content

Commit adf9dde

Browse files
committed
[CORE] Move File System files to Core (#1279)
1 parent f17504c commit adf9dde

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+320
-4760
lines changed

Core/CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,15 @@ add_library(corei_gameengine_include INTERFACE)
33
add_library(corei_libraries_include INTERFACE)
44
add_library(corei_libraries_source_wwvegas INTERFACE)
55
add_library(corei_libraries_source_wwvegas_wwlib INTERFACE)
6+
add_library(corei_main INTERFACE)
67
add_library(corei_always INTERFACE)
78

89
target_include_directories(corei_gameengine_include INTERFACE "GameEngine/Include")
910
target_include_directories(corei_libraries_include INTERFACE "Libraries/Include")
1011
target_include_directories(corei_libraries_source_wwvegas INTERFACE "Libraries/Source/WWVegas")
1112
target_include_directories(corei_libraries_source_wwvegas_wwlib INTERFACE "Libraries/Source/WWVegas/WWLib")
13+
target_include_directories(corei_main INTERFACE "Main")
14+
1215
target_link_libraries(corei_always INTERFACE
1316
core_utility
1417
corei_libraries_include
@@ -25,6 +28,6 @@ add_subdirectory(Libraries)
2528
add_subdirectory(GameEngine)
2629

2730
# Platform specific GameEngine code
28-
# add_subdirectory(GameEngineDevice)
31+
add_subdirectory(GameEngineDevice)
2932

3033
add_subdirectory(Tools)

Core/GameEngine/CMakeLists.txt

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
set(GAMEENGINE_SRC
22
# Include/Common/AcademyStats.h
33
# Include/Common/ActionManager.h
4-
# Include/Common/ArchiveFile.h
5-
# Include/Common/ArchiveFileSystem.h
4+
Include/Common/ArchiveFile.h
5+
Include/Common/ArchiveFileSystem.h
66
# Include/Common/AsciiString.h
77
# Include/Common/AudioAffect.h
88
# Include/Common/AudioEventInfo.h
@@ -37,8 +37,8 @@ set(GAMEENGINE_SRC
3737
# Include/Common/encrypt.h
3838
# Include/Common/Energy.h
3939
# Include/Common/Errors.h
40-
# Include/Common/file.h
41-
# Include/Common/FileSystem.h
40+
Include/Common/file.h
41+
Include/Common/FileSystem.h
4242
# Include/Common/FunctionLexicon.h
4343
# Include/Common/GameAudio.h
4444
# Include/Common/GameCommon.h
@@ -63,8 +63,8 @@ set(GAMEENGINE_SRC
6363
# Include/Common/Language.h
6464
# Include/Common/LatchRestore.h
6565
# Include/Common/List.h
66-
# Include/Common/LocalFile.h
67-
# Include/Common/LocalFileSystem.h
66+
Include/Common/LocalFile.h
67+
Include/Common/LocalFileSystem.h
6868
# Include/Common/MapObject.h
6969
# Include/Common/MapReaderWriterInfo.h
7070
# Include/Common/MessageStream.h
@@ -91,7 +91,7 @@ set(GAMEENGINE_SRC
9191
# Include/Common/QuickmatchPreferences.h
9292
# Include/Common/QuotedPrintable.h
9393
# Include/Common/Radar.h
94-
# Include/Common/RAMFile.h
94+
Include/Common/RAMFile.h
9595
# Include/Common/RandomValue.h
9696
# Include/Common/Recorder.h
9797
# Include/Common/Registry.h
@@ -113,7 +113,7 @@ set(GAMEENGINE_SRC
113113
# Include/Common/StatsCollector.h
114114
# Include/Common/STLTypedefs.h
115115
Include/Common/STLUtils.h
116-
# Include/Common/StreamingArchiveFile.h
116+
Include/Common/StreamingArchiveFile.h
117117
# Include/Common/SubsystemInterface.h
118118
# Include/Common/SystemInfo.h
119119
# Include/Common/Team.h
@@ -630,8 +630,8 @@ set(GAMEENGINE_SRC
630630
# Source/Common/SkirmishBattleHonors.cpp
631631
# Source/Common/StateMachine.cpp
632632
# Source/Common/StatsCollector.cpp
633-
# Source/Common/System/ArchiveFile.cpp
634-
# Source/Common/System/ArchiveFileSystem.cpp
633+
Source/Common/System/ArchiveFile.cpp
634+
Source/Common/System/ArchiveFileSystem.cpp
635635
# Source/Common/System/AsciiString.cpp
636636
# Source/Common/System/BuildAssistant.cpp
637637
# Source/Common/System/CDManager.cpp
@@ -641,28 +641,28 @@ set(GAMEENGINE_SRC
641641
# Source/Common/System/Directory.cpp
642642
# Source/Common/System/DisabledTypes.cpp
643643
# Source/Common/System/encrypt.cpp
644-
# Source/Common/System/File.cpp
645-
# Source/Common/System/FileSystem.cpp
644+
Source/Common/System/File.cpp
645+
Source/Common/System/FileSystem.cpp
646646
# Source/Common/System/FunctionLexicon.cpp
647647
# Source/Common/System/GameCommon.cpp
648648
#Source/Common/System/GameMemory.cpp # is conditionally appended
649649
# Source/Common/System/GameType.cpp
650650
# Source/Common/System/Geometry.cpp
651651
# Source/Common/System/KindOf.cpp
652652
# Source/Common/System/List.cpp
653-
# Source/Common/System/LocalFile.cpp
654-
# Source/Common/System/LocalFileSystem.cpp
653+
Source/Common/System/LocalFile.cpp
654+
Source/Common/System/LocalFileSystem.cpp
655655
#Source/Common/System/MemoryInit.cpp # is conditionally appended
656656
# Source/Common/System/ObjectStatusTypes.cpp
657657
# Source/Common/System/QuotedPrintable.cpp
658658
# Source/Common/System/Radar.cpp
659-
# Source/Common/System/RAMFile.cpp
659+
Source/Common/System/RAMFile.cpp
660660
# Source/Common/System/registry.cpp
661661
# Source/Common/System/SaveGame/GameState.cpp
662662
# Source/Common/System/SaveGame/GameStateMap.cpp
663663
# Source/Common/System/Snapshot.cpp
664664
# Source/Common/System/StackDump.cpp
665-
# Source/Common/System/StreamingArchiveFile.cpp
665+
Source/Common/System/StreamingArchiveFile.cpp
666666
# Source/Common/System/SubsystemInterface.cpp
667667
# Source/Common/System/Trig.cpp
668668
# Source/Common/System/UnicodeString.cpp

0 commit comments

Comments
 (0)