Move main executable source to its own directory (1dot13#248)

* Move main executable files to their own directory * Adapt the build to the new file structure ... and fix some weird #include's that were relying on the project root being an include directory.
majcosta · Oct 23, 2023 · ae55496 · ae55496
1 parent 5d3118e
commit ae55496
Show file tree

Hide file tree

Showing 90 changed files with 68 additions and 68 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -23,7 +23,7 @@ set(usingMsBuild $<STREQUAL:${CMAKE_VS_PLATFORM_NAME},Win32>)
 set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
 
 add_compile_definitions(CINTERFACE XML_STATIC VFS_STATIC VFS_WITH_SLF VFS_WITH_7ZIP _CRT_SECURE_NO_DEPRECATE)
-include_directories(${CMAKE_SOURCE_DIR} "ext/VFS/include" Utils TileEngine TacticalAI ModularizedTacticalAI Tactical Strategic sgp Res Lua Laptop Multiplayer Editor Console)
+include_directories(Ja2 "ext/VFS/include" Utils TileEngine TacticalAI "ModularizedTacticalAI/include" Tactical Strategic sgp "Ja2/Res" Lua Laptop Multiplayer Editor Console)
 
 # external libraries
 add_subdirectory("ext/libpng")
@@ -59,59 +59,7 @@ foreach(lib IN LISTS Ja2_Libs)
 	add_subdirectory(${lib})
 endforeach()
 
-# TODO: Move these units into their own directory to declutter the root dir and CMakeLists.txt file
-set(Ja2Src
-"aniviewscreen.cpp"
-"Credits.cpp"
-"Fade Screen.cpp"
-"FeaturesScreen.cpp"
-"GameInitOptionsScreen.cpp"
-"gameloop.cpp"
-"gamescreen.cpp"
-"GameSettings.cpp"
-"GameVersion.cpp"
-"HelpScreen.cpp"
-"Init.cpp"
-"Intro.cpp"
-"JA2 Splash.cpp"
-"Ja25Update.cpp"
-"jascreens.cpp"
-"Language Defines.cpp"
-"Loading Screen.cpp"
-"MainMenuScreen.cpp"
-"MessageBoxScreen.cpp"
-"MPChatScreen.cpp"
-"MPConnectScreen.cpp"
-"MPHostScreen.cpp"
-"MPJoinScreen.cpp"
-"MPScoreScreen.cpp"
-"MPXmlTeams.cpp"
-"Options Screen.cpp"
-"profiler.cpp"
-"SaveLoadGame.cpp"
-"SaveLoadScreen.cpp"
-"SCREENS.cpp"
-"Sys Globals.cpp"
-"ub_config.cpp"
-"XML_DifficultySettings.cpp"
-"XML_IntroFiles.cpp"
-"XML_Layout_MainMenu.cpp"
-Res/ja2.rc
-)
-
-set(Ja2_Libraries
-"${PROJECT_SOURCE_DIR}/libexpatMT.lib"
-"Dbghelp.lib"
-Lua
-"${PROJECT_SOURCE_DIR}/lua51.lib"
-"${PROJECT_SOURCE_DIR}/lua51.vc9.lib"
-"Winmm.lib"
-"${PROJECT_SOURCE_DIR}/SMACKW32.LIB"
-"${PROJECT_SOURCE_DIR}/binkw32.lib"
-bfVFS
-"ws2_32.lib"
-Multiplayer
-)
+add_subdirectory(Ja2)
 
 # simple function to validate Languages and Application choices
 include(cmake/ValidateOptions.cmake)

diff --git a/Ja2/CMakeLists.txt b/Ja2/CMakeLists.txt
@@ -0,0 +1,52 @@
+set(Ja2Src
+"${CMAKE_CURRENT_SOURCE_DIR}/aniviewscreen.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/Credits.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/Fade Screen.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/FeaturesScreen.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/GameInitOptionsScreen.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/gameloop.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/gamescreen.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/GameSettings.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/GameVersion.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/HelpScreen.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/Init.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/Intro.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/JA2 Splash.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/Ja25Update.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/jascreens.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/Language Defines.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/Loading Screen.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/MainMenuScreen.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/MessageBoxScreen.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/MPChatScreen.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/MPConnectScreen.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/MPHostScreen.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/MPJoinScreen.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/MPScoreScreen.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/MPXmlTeams.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/Options Screen.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/profiler.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/SaveLoadGame.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/SaveLoadScreen.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/SCREENS.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/Sys Globals.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/ub_config.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/XML_DifficultySettings.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/XML_IntroFiles.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/XML_Layout_MainMenu.cpp"
+${CMAKE_CURRENT_SOURCE_DIR}/Res/ja2.rc
+PARENT_SCOPE)
+
+set(Ja2_Libraries
+"${CMAKE_SOURCE_DIR}/libexpatMT.lib"
+"Dbghelp.lib"
+Lua
+"${CMAKE_SOURCE_DIR}/lua51.lib"
+"${CMAKE_SOURCE_DIR}/lua51.vc9.lib"
+"Winmm.lib"
+"${CMAKE_SOURCE_DIR}/SMACKW32.LIB"
+"${CMAKE_SOURCE_DIR}/binkw32.lib"
+bfVFS
+"ws2_32.lib"
+Multiplayer
+PARENT_SCOPE)
diff --git a/Cheats.h → Ja2/Cheats.h b/Cheats.h → Ja2/Cheats.h
diff --git a/Credits.cpp → Ja2/Credits.cpp b/Credits.cpp → Ja2/Credits.cpp
diff --git a/Credits.h → Ja2/Credits.h b/Credits.h → Ja2/Credits.h
diff --git a/Fade Screen.cpp → Ja2/Fade Screen.cpp b/Fade Screen.cpp → Ja2/Fade Screen.cpp
diff --git a/Fade Screen.h → Ja2/Fade Screen.h b/Fade Screen.h → Ja2/Fade Screen.h
diff --git a/FeaturesScreen.cpp → Ja2/FeaturesScreen.cpp b/FeaturesScreen.cpp → Ja2/FeaturesScreen.cpp
diff --git a/FeaturesScreen.h → Ja2/FeaturesScreen.h b/FeaturesScreen.h → Ja2/FeaturesScreen.h
diff --git a/GameInitOptionsScreen.cpp → Ja2/GameInitOptionsScreen.cpp b/GameInitOptionsScreen.cpp → Ja2/GameInitOptionsScreen.cpp
diff --git a/GameInitOptionsScreen.h → Ja2/GameInitOptionsScreen.h b/GameInitOptionsScreen.h → Ja2/GameInitOptionsScreen.h
diff --git a/GameSettings.cpp → Ja2/GameSettings.cpp b/GameSettings.cpp → Ja2/GameSettings.cpp
diff --git a/GameSettings.h → Ja2/GameSettings.h b/GameSettings.h → Ja2/GameSettings.h
diff --git a/GameVersion.cpp → Ja2/GameVersion.cpp b/GameVersion.cpp → Ja2/GameVersion.cpp
diff --git a/GameVersion.h → Ja2/GameVersion.h b/GameVersion.h → Ja2/GameVersion.h
diff --git a/HelpScreen.cpp → Ja2/HelpScreen.cpp b/HelpScreen.cpp → Ja2/HelpScreen.cpp
diff --git a/HelpScreen.h → Ja2/HelpScreen.h b/HelpScreen.h → Ja2/HelpScreen.h
diff --git a/HelpScreenText.h → Ja2/HelpScreenText.h b/HelpScreenText.h → Ja2/HelpScreenText.h
diff --git a/Init.cpp → Ja2/Init.cpp b/Init.cpp → Ja2/Init.cpp
diff --git a/Init.h → Ja2/Init.h b/Init.h → Ja2/Init.h
diff --git a/Intro.cpp → Ja2/Intro.cpp b/Intro.cpp → Ja2/Intro.cpp
diff --git a/Intro.h → Ja2/Intro.h b/Intro.h → Ja2/Intro.h
diff --git a/JA2 Splash.cpp → Ja2/JA2 Splash.cpp b/JA2 Splash.cpp → Ja2/JA2 Splash.cpp
diff --git a/JA2 Splash.h → Ja2/JA2 Splash.h b/JA2 Splash.h → Ja2/JA2 Splash.h
diff --git a/Ja25Update.cpp → Ja2/Ja25Update.cpp b/Ja25Update.cpp → Ja2/Ja25Update.cpp
diff --git a/Ja25Update.h → Ja2/Ja25Update.h b/Ja25Update.h → Ja2/Ja25Update.h
diff --git a/Language Defines.cpp → Ja2/Language Defines.cpp b/Language Defines.cpp → Ja2/Language Defines.cpp
diff --git a/Language Defines.h → Ja2/Language Defines.h b/Language Defines.h → Ja2/Language Defines.h
diff --git a/Loading Screen.cpp → Ja2/Loading Screen.cpp b/Loading Screen.cpp → Ja2/Loading Screen.cpp
diff --git a/Loading Screen.h → Ja2/Loading Screen.h b/Loading Screen.h → Ja2/Loading Screen.h
diff --git a/MPChatScreen.cpp → Ja2/MPChatScreen.cpp b/MPChatScreen.cpp → Ja2/MPChatScreen.cpp
diff --git a/MPChatScreen.h → Ja2/MPChatScreen.h b/MPChatScreen.h → Ja2/MPChatScreen.h
diff --git a/MPConnectScreen.cpp → Ja2/MPConnectScreen.cpp b/MPConnectScreen.cpp → Ja2/MPConnectScreen.cpp
diff --git a/MPConnectScreen.h → Ja2/MPConnectScreen.h b/MPConnectScreen.h → Ja2/MPConnectScreen.h
diff --git a/MPHostScreen.cpp → Ja2/MPHostScreen.cpp b/MPHostScreen.cpp → Ja2/MPHostScreen.cpp
diff --git a/MPHostScreen.h → Ja2/MPHostScreen.h b/MPHostScreen.h → Ja2/MPHostScreen.h
diff --git a/MPJoinScreen.cpp → Ja2/MPJoinScreen.cpp b/MPJoinScreen.cpp → Ja2/MPJoinScreen.cpp
diff --git a/MPJoinScreen.h → Ja2/MPJoinScreen.h b/MPJoinScreen.h → Ja2/MPJoinScreen.h
diff --git a/MPScoreScreen.cpp → Ja2/MPScoreScreen.cpp b/MPScoreScreen.cpp → Ja2/MPScoreScreen.cpp
diff --git a/MPScoreScreen.h → Ja2/MPScoreScreen.h b/MPScoreScreen.h → Ja2/MPScoreScreen.h
diff --git a/MPXmlTeams.cpp → Ja2/MPXmlTeams.cpp b/MPXmlTeams.cpp → Ja2/MPXmlTeams.cpp
diff --git a/MPXmlTeams.hpp → Ja2/MPXmlTeams.hpp b/MPXmlTeams.hpp → Ja2/MPXmlTeams.hpp
diff --git a/MainMenuScreen.cpp → Ja2/MainMenuScreen.cpp b/MainMenuScreen.cpp → Ja2/MainMenuScreen.cpp
diff --git a/MessageBoxScreen.cpp → Ja2/MessageBoxScreen.cpp b/MessageBoxScreen.cpp → Ja2/MessageBoxScreen.cpp
diff --git a/MessageBoxScreen.h → Ja2/MessageBoxScreen.h b/MessageBoxScreen.h → Ja2/MessageBoxScreen.h
diff --git a/Options Screen.cpp → Ja2/Options Screen.cpp b/Options Screen.cpp → Ja2/Options Screen.cpp
diff --git a/Options Screen.h → Ja2/Options Screen.h b/Options Screen.h → Ja2/Options Screen.h
diff --git a/Res/ja2.aps → Ja2/Res/ja2.aps b/Res/ja2.aps → Ja2/Res/ja2.aps
diff --git a/Res/ja2.rc → Ja2/Res/ja2.rc b/Res/ja2.rc → Ja2/Res/ja2.rc
diff --git a/Res/jagged3.ico → Ja2/Res/jagged3.ico b/Res/jagged3.ico → Ja2/Res/jagged3.ico
diff --git a/Res/resource.h → Ja2/Res/resource.h b/Res/resource.h → Ja2/Res/resource.h
diff --git a/SaveLoadGame.cpp → Ja2/SaveLoadGame.cpp b/SaveLoadGame.cpp → Ja2/SaveLoadGame.cpp
diff --git a/SaveLoadGame.h → Ja2/SaveLoadGame.h b/SaveLoadGame.h → Ja2/SaveLoadGame.h
diff --git a/SaveLoadScreen.cpp → Ja2/SaveLoadScreen.cpp b/SaveLoadScreen.cpp → Ja2/SaveLoadScreen.cpp
diff --git a/SaveLoadScreen.h → Ja2/SaveLoadScreen.h b/SaveLoadScreen.h → Ja2/SaveLoadScreen.h
diff --git a/Screens.cpp → Ja2/Screens.cpp b/Screens.cpp → Ja2/Screens.cpp
diff --git a/Screens.h → Ja2/Screens.h b/Screens.h → Ja2/Screens.h
diff --git a/Sys Globals.cpp → Ja2/Sys Globals.cpp b/Sys Globals.cpp → Ja2/Sys Globals.cpp
diff --git a/Sys Globals.h → Ja2/Sys Globals.h b/Sys Globals.h → Ja2/Sys Globals.h
diff --git a/VtuneApi.h → Ja2/VtuneApi.h b/VtuneApi.h → Ja2/VtuneApi.h
diff --git a/XML_DifficultySettings.cpp → Ja2/XML_DifficultySettings.cpp b/XML_DifficultySettings.cpp → Ja2/XML_DifficultySettings.cpp
diff --git a/XML_IntroFiles.cpp → Ja2/XML_IntroFiles.cpp b/XML_IntroFiles.cpp → Ja2/XML_IntroFiles.cpp
diff --git a/XML_Layout_MainMenu.cpp → Ja2/XML_Layout_MainMenu.cpp b/XML_Layout_MainMenu.cpp → Ja2/XML_Layout_MainMenu.cpp
diff --git a/aniviewscreen.cpp → Ja2/aniviewscreen.cpp b/aniviewscreen.cpp → Ja2/aniviewscreen.cpp
diff --git a/builddefines.h → Ja2/builddefines.h b/builddefines.h → Ja2/builddefines.h
diff --git a/gameloop.cpp → Ja2/gameloop.cpp b/gameloop.cpp → Ja2/gameloop.cpp
diff --git a/gameloop.h → Ja2/gameloop.h b/gameloop.h → Ja2/gameloop.h
diff --git a/gamescreen.cpp → Ja2/gamescreen.cpp b/gamescreen.cpp → Ja2/gamescreen.cpp
diff --git a/gamescreen.h → Ja2/gamescreen.h b/gamescreen.h → Ja2/gamescreen.h
diff --git a/ja2.h → Ja2/ja2.h b/ja2.h → Ja2/ja2.h
diff --git a/jascreens.cpp → Ja2/jascreens.cpp b/jascreens.cpp → Ja2/jascreens.cpp
diff --git a/jascreens.h → Ja2/jascreens.h b/jascreens.h → Ja2/jascreens.h
diff --git a/legion cfg.cpp → Ja2/legion cfg.cpp b/legion cfg.cpp → Ja2/legion cfg.cpp
diff --git a/legion cfg.h → Ja2/legion cfg.h b/legion cfg.h → Ja2/legion cfg.h
diff --git a/local.h → Ja2/local.h b/local.h → Ja2/local.h
diff --git a/mainmenuscreen.h → Ja2/mainmenuscreen.h b/mainmenuscreen.h → Ja2/mainmenuscreen.h
diff --git a/profiler.cpp → Ja2/profiler.cpp b/profiler.cpp → Ja2/profiler.cpp
diff --git a/profiler.h → Ja2/profiler.h b/profiler.h → Ja2/profiler.h
diff --git a/screenids.h → Ja2/screenids.h b/screenids.h → Ja2/screenids.h
diff --git a/ub_config.cpp → Ja2/ub_config.cpp b/ub_config.cpp → Ja2/ub_config.cpp
diff --git a/ub_config.h → Ja2/ub_config.h b/ub_config.h → Ja2/ub_config.h
diff --git a/Laptop/Encyclopedia_Data_new.cpp b/Laptop/Encyclopedia_Data_new.cpp
@@ -21,7 +21,7 @@
 	#include "QuestText.h"			//quest: name
 	#include "laptop.h"				//ui positions
 	#include "Utilities.h"
-	#include "Utils/Cursors.h"
+	#include "Cursors.h"
 	#include "sysutil.h"			//extra Buffer for scaling image
 	#include "vsurface.h"			//fill extra buffer with black color
 	#include "Text.h"

diff --git a/Laptop/Encyclopedia_new.cpp b/Laptop/Encyclopedia_new.cpp
@@ -36,7 +36,7 @@
 	#include "laptop.h"//UI dimensions, mouse regions
 	#include "Utilities.h"//file names
 	#include "vobject.h"//video objects
-	#include "Utils/Cursors.h"
+	#include "Cursors.h"
 	#include "Text.h"//button text
 	#include "Button System.h"
 	#include "Encyclopedia_new.h"

diff --git a/TacticalAI/AIMain.cpp b/TacticalAI/AIMain.cpp
@@ -52,9 +52,9 @@
 
 #include "connect.h"
 // needed to use the modularized tactical AI:
-#include "ModularizedTacticalAI/include/Plan.h"
-#include "ModularizedTacticalAI/include/PlanFactoryLibrary.h"
-#include "ModularizedTacticalAI/include/AbstractPlanFactory.h"
+#include "Plan.h"
+#include "PlanFactoryLibrary.h"
+#include "AbstractPlanFactory.h"
 
 #ifdef JA2UB
 #include "Ja25_Tactical.h"

diff --git a/TacticalAI/Realtime.cpp b/TacticalAI/Realtime.cpp
@@ -13,9 +13,9 @@
 	#include "Quests.h"
 	#include "GameSettings.h"
 // needed to use the modularized tactical AI:
-#include "ModularizedTacticalAI/include/Plan.h"
-#include "ModularizedTacticalAI/include/PlanFactoryLibrary.h"
-#include "ModularizedTacticalAI/include/AbstractPlanFactory.h"
+#include "Plan.h"
+#include "PlanFactoryLibrary.h"
+#include "AbstractPlanFactory.h"
 
 
 UINT16 RealtimeDelay( SOLDIERTYPE * pSoldier )

diff --git a/Utils/WordWrap.h b/Utils/WordWrap.h
@@ -2,8 +2,8 @@
 #define	__WORDWRAP_H_
 
 #include "types.h"
-#include "LAPTOP\files.h"
-#include "LAPTOP\email.h"
+#include "files.h"
+#include "email.h"
 
 //Flags for DrawTextToScreen()
 

diff --git a/lua/lua_function.cpp b/lua/lua_function.cpp
@@ -1,5 +1,5 @@
 #include "DEBUG.H"
-#include "lua/lua_function.h"
+#include "lua_function.h"
 
 template<>
 LuaFunction& LuaFunction::Param<std::string>(std::string const& par)

diff --git a/lua/lua_state.cpp b/lua/lua_state.cpp
@@ -1,4 +1,4 @@
-#include "lua/lua_state.h"
+#include "lua_state.h"
 #include <Debug.h>
 #include "sgp_logger.h"
 

diff --git a/lua/lua_table.cpp b/lua/lua_table.cpp
@@ -1,4 +1,4 @@
-#include "lua/lua_table.h"
+#include "lua_table.h"
 
 /*
  *  Table constructors

diff --git a/lua/lua_table.h b/lua/lua_table.h
@@ -1,7 +1,7 @@
 #ifndef _LUA_TABLE_H_
 #define _LUA_TABLE_H_
 
-#include "lua/lua_state.h"
+#include "lua_state.h"
 
 class LuaTable
 {