Subdirectory related amendments (#474)

* Add ExternalData directory to CMakeLists.txt * Move external data files to game-based subdirectory
luciusDXL · Nov 25, 2024 · 297918d · 297918d
1 parent f063c35
commit 297918d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -74,6 +74,7 @@ if(ENABLE_TFE)
 		# the necessary support file directories into the build env.
 		execute_process(COMMAND ln -sf ${CMAKE_SOURCE_DIR}/TheForceEngine/Captions)
 		execute_process(COMMAND ln -sf ${CMAKE_SOURCE_DIR}/TheForceEngine/Documentation)
+		execute_process(COMMAND ln -sf ${CMAKE_SOURCE_DIR}/TheForceEngine/ExternalData)
 		execute_process(COMMAND ln -sf ${CMAKE_SOURCE_DIR}/TheForceEngine/Fonts)
 		execute_process(COMMAND ln -sf ${CMAKE_SOURCE_DIR}/TheForceEngine/Mods)
 		execute_process(COMMAND ln -sf ${CMAKE_SOURCE_DIR}/TheForceEngine/Shaders)
@@ -130,6 +131,7 @@ if(ENABLE_TFE)
 	install(DIRECTORY
 		"${CMAKE_CURRENT_SOURCE_DIR}/TheForceEngine/Captions"
 		"${CMAKE_CURRENT_SOURCE_DIR}/TheForceEngine/Documentation"
+		"${CMAKE_CURRENT_SOURCE_DIR}/TheForceEngine/ExternalData"
 		"${CMAKE_CURRENT_SOURCE_DIR}/TheForceEngine/UI_Text"
 		"${CMAKE_CURRENT_SOURCE_DIR}/TheForceEngine/UI_Images"
 		"${CMAKE_CURRENT_SOURCE_DIR}/TheForceEngine/EditorDef"

diff --git a/TheForceEngine/ExternalData/effects.json → ...gine/ExternalData/DarkForces/effects.json b/TheForceEngine/ExternalData/effects.json → ...gine/ExternalData/DarkForces/effects.json
diff --git a/TheForceEngine/ExternalData/projectiles.json → .../ExternalData/DarkForces/projectiles.json b/TheForceEngine/ExternalData/projectiles.json → .../ExternalData/DarkForces/projectiles.json
diff --git a/TheForceEngine/TFE_ExternalData/weaponExternal.cpp b/TheForceEngine/TFE_ExternalData/weaponExternal.cpp
@@ -56,7 +56,7 @@ namespace TFE_ExternalData
 	{
 		const char* programDir = TFE_Paths::getPath(PATH_PROGRAM);
 		char extDataFile[TFE_MAX_PATH];
-		sprintf(extDataFile, "%sExternalData/projectiles.json", programDir);
+		sprintf(extDataFile, "%sExternalData/DarkForces/projectiles.json", programDir);
 
 		TFE_System::logWrite(LOG_MSG, "EXTERNAL_DATA", "Loading projectile data");
 		FileStream file;
@@ -148,7 +148,7 @@ namespace TFE_ExternalData
 	{
 		const char* programDir = TFE_Paths::getPath(PATH_PROGRAM);
 		char extDataFile[TFE_MAX_PATH];
-		sprintf(extDataFile, "%sExternalData/effects.json", programDir);
+		sprintf(extDataFile, "%sExternalData/DarkForces/effects.json", programDir);
 
 		TFE_System::logWrite(LOG_MSG, "EXTERNAL_DATA", "Loading effects data");
 		FileStream file;