fix: Add missing includes, initSubsystem helper, and RTS_HAS_JSON_CHUNK define to DataChunkConverter

Author: bobtista

GeneralsMD/Code/Tools/DataChunkConverter/CMakeLists.txt

@@ -11,6 +11,11 @@ if (NOT IS_VS6_BUILD)
         ${CMAKE_CURRENT_SOURCE_DIR}/../../GameEngine/Include/Precompiled
         ${CMAKE_CURRENT_SOURCE_DIR}/../../Libraries/Include
         ${CMAKE_SOURCE_DIR}/Core/GameEngine/Include
+        ${CMAKE_CURRENT_SOURCE_DIR}/../../GameEngineDevice/Include
+    )
+
+    target_compile_definitions(z_datachunkconverter PRIVATE
+        RTS_HAS_JSON_CHUNK
     )
 
     target_link_libraries(z_datachunkconverter PRIVATE

GeneralsMD/Code/Tools/DataChunkConverter/DataChunkConverter.cpp

@@ -42,11 +42,25 @@
 #include "GameLogic/ScriptEngine.h"
 #include "GameLogic/SidesList.h"
 #include "GameClient/ShellHooks.h"
+#include "Common/SubsystemInterface.h"
+#include "Common/LocalFileSystem.h"
+#include "Common/ArchiveFileSystem.h"
+#include "Win32Device/Common/Win32LocalFileSystem.h"
+#include "Win32Device/Common/Win32BIGFileSystem.h"
 
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 
+static SubsystemInterfaceList TheSubsystemListRecord;
+
+template<class SUBSYSTEM>
+void initSubsystem(SUBSYSTEM*& sysref, SUBSYSTEM* sys, const char* path1 = NULL, const char* path2 = NULL)
+{
+	sysref = sys;
+	TheSubsystemListRecord.initSubsystem(sys, path1, path2, NULL);
+}
+
 class SimpleFileOutputStream : public OutputStream
 {
 	FILE* m_file;
@@ -235,7 +249,7 @@ int main(int argc, char* argv[])
 		return 1;
 	}
 
-	initSubsystem(TheFileSystem, new FileSystem);
+	TheFileSystem = new FileSystem;
 	initSubsystem(TheLocalFileSystem, (LocalFileSystem*)new Win32LocalFileSystem);
 	initSubsystem(TheArchiveFileSystem, (ArchiveFileSystem*)new Win32BIGFileSystem);
 	initSubsystem(TheWritableGlobalData, new GlobalData(), "Data\\INI\\Default\\GameData", "Data\\INI\\GameData");
@@ -244,9 +258,12 @@ int main(int argc, char* argv[])
 	initSubsystem(TheMultiplayerSettings, new MultiplayerSettings(), "Data\\INI\\Default\\Multiplayer", "Data\\INI\\Multiplayer");
 	initSubsystem(TheTerrainTypes, new TerrainTypeCollection(), "Data\\INI\\Default\\TerrainTypes", "Data\\INI\\TerrainTypes");
 	initSubsystem(TheThingFactory, new ThingFactory(), "Data\\INI\\Default\\Thing", "Data\\INI\\Thing");
-	initSubsystem(TheNameKeyGenerator, new NameKeyGenerator());
+	TheNameKeyGenerator = new NameKeyGenerator();
+	TheNameKeyGenerator->init();
 	initSubsystem(TheScriptEngine, new ScriptEngine());
 
+	TheSubsystemListRecord.postProcessLoadAll();
+
 	Bool success = false;
 	if (isInputSCB) {
 		success = convertSCBToJSON(inputPath, outputPath);