Unify Autorun tool and move its files to Core

Core/CMakeLists.txt

@@ -32,6 +32,4 @@ add_subdirectory(Libraries)
 # Platform specific GameEngine code
 # add_subdirectory(GameEngineDevice)
 
-if (RTS_BUILD_CORE_TOOLS OR RTS_BUILD_CORE_EXTRAS)
-    add_subdirectory(Tools)
-endif()
+add_subdirectory(Tools)

GeneralsMD/Code/Tools/Autorun/AUTORUN.RC → Core/Tools/Autorun/AUTORUN.RC

@@ -8,6 +8,7 @@
 // Generated from the TEXTINCLUDE 2 resource.
 //
 #include "afxres.h"
+
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
 

Generals/Code/Tools/Autorun/CDCNTRL.CPP → Core/Tools/Autorun/CDCNTRL.CPP

@@ -1,5 +1,5 @@
 /*
-**	Command & Conquer Generals(tm)
+**	Command & Conquer Generals Zero Hour(tm)
 **	Copyright 2025 Electronic Arts Inc.
 **
 **	This program is free software: you can redistribute it and/or modify

Core/Tools/Autorun/CMakeLists.txt

@@ -0,0 +1,62 @@
+set(AUTORUN_SRC
+    "ARGS.CPP"
+    "ARGS.H"
+    "autorun.cpp"
+    "autorun.h"
+    "CallbackHook.h"
+    "CDCNTRL.CPP"
+    "CDCNTRL.H"
+    "DrawButton.cpp"
+    "DrawButton.h"
+    "EZGIMEX.cpp"
+    "GameText.cpp"
+    "GameText.h"
+    "GETCD.CPP"
+    "GetCD.h"
+    "gimex.h"
+    "IGR.cpp"
+    "IGR.h"
+    "Jsupport.cpp"
+    "JSUPPORT.H"
+    "leanAndMeanAutorun.h"
+    "Locale_API.cpp"
+    "Locale_API.h"
+    "locale.cpp"
+    "locale.h"
+    "POINT.h"
+    "RECT.h"
+    "resource.h"
+    "TTFont.cpp"
+    "TTFont.h"
+    "Utils.cpp"
+    "Utils.h"
+    "ViewHTML.cpp"
+    "ViewHTML.h"
+    "WinFix.CPP"
+    "WinFix.H"
+    "Wnd_file.cpp"
+    "Wnd_File.h"
+    "WSYS_File.cpp"
+    "WSYS_file.h"
+    "WSYS_FileSystem.cpp"
+    "WSYS_FileSystem.h"
+    "WSYS_RAMFile.cpp"
+    "WSYS_RAMFile.h"
+    "WSYS_StdFile.cpp"
+    "WSYS_StdFile.h"
+    "WSYS_StdFileSystem.cpp"
+    "WSYS_StdFileSystem.h"
+)
+
+add_library(corei_autorun INTERFACE)
+
+target_sources(corei_autorun INTERFACE ${AUTORUN_SRC})
+
+target_link_libraries(corei_autorun INTERFACE
+    core_config
+    winmm
+)
+
+if(WIN32 OR "${CMAKE_SYSTEM}" MATCHES "Windows")
+    target_sources(corei_autorun INTERFACE AUTORUN.RC)
+endif()

GeneralsMD/Code/Tools/Autorun/autorun.cpp → Core/Tools/Autorun/autorun.cpp

@@ -122,8 +122,6 @@
 #include "Win32Device/Common/Win32BIGFileSystem.h"
 #endif
 
-
-
 //-----------------------------------------------------------------------------
 //  DEFINES
 //-----------------------------------------------------------------------------
@@ -2750,7 +2748,7 @@ BOOL CALLBACK  Dialog_Box_Proc( HWND window_handle, UINT message, WPARAM w_param
 
 				} else if( b800X600 ) {
 
-					strcpy( szBitmap, _TEXT( "BacKground" ));
+					strcpy( szBitmap, _TEXT( "Background" ));
 
 					if ( LANG_FRE == LanguageID ) {
 						strcpy( szLicense, _TEXT( "License_FRENCH2" ));
@@ -3963,11 +3961,9 @@ BOOL CALLBACK  Dialog_Box_Proc( HWND window_handle, UINT message, WPARAM w_param
 						// Uninstll.exe which in turn launches Uninst.exe thus 
 						// ::Run_Install ends before Uninst.exe is done.
 						//---------------------------------------------------------------
-#if 1
 						if ( result ) {
 							end_dialog = true;
 						}
-#endif
 						break;
 
 					default:

GeneralsMD/Code/Tools/Autorun/autorun.h → Core/Tools/Autorun/autorun.h

@@ -90,7 +90,11 @@ typedef enum {
 #define UNINSTALL_NAME	  			"Uninst.exe"
 
 //#define SHELL_FOLDERS_KEY			"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders"
-#define SHELL_UNINSTALL_KEY			"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\InstallShield_{F3E9C243-122E-4D6B-ACC1-E1FEC02F6CA1}"
+#if RTS_GENERALS
+# define SHELL_UNINSTALL_KEY			"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall"
+#elif RTS_ZEROHOUR
+# define SHELL_UNINSTALL_KEY			"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\InstallShield_{F3E9C243-122E-4D6B-ACC1-E1FEC02F6CA1}"
+#endif
 #define SHELL_APP_PATHS_KEY			"Software\\Microsoft\\Windows\\CurrentVersion\\App Paths" 
 #define PROGRAMS_SUBKEY				"Programs"
 #define COMMON_PROGRAMS_SUBKEY		"Common Programs"
@@ -103,10 +107,16 @@ typedef enum {
 */
 #define ELECTRONICARTS_SUBKEY		"Electronic Arts"
 #define EAGAMES_SUBKEY				"EA Games"
-#define GENERALS_SUBKEY				"Command and Conquer Generals Zero Hour"
 #define SOFTWARE_EAGAMES_KEY		"Software\\Electronic Arts\\EA Games\\"
-#define EAGAMES_GENERALS_KEY		"Software\\Electronic Arts\\EA Games\\Command and Conquer Generals Zero Hour"
-#define EAGAMES_ERGC_KEY			"Software\\Electronic Arts\\EA Games\\Command and Conquer Generals Zero Hour\\ergc"
+#if RTS_GENERALS
+# define GENERALS_SUBKEY				"Generals"
+# define EAGAMES_GENERALS_KEY		"Software\\Electronic Arts\\EA Games\\Generals"
+# define EAGAMES_ERGC_KEY				"Software\\Electronic Arts\\EA Games\\Generals\\ergc"
+#elif RTS_ZEROHOUR
+# define GENERALS_SUBKEY				"Command and Conquer Generals Zero Hour"
+# define EAGAMES_GENERALS_KEY		"Software\\Electronic Arts\\EA Games\\Command and Conquer Generals Zero Hour"
+# define EAGAMES_ERGC_KEY				"Software\\Electronic Arts\\EA Games\\Command and Conquer Generals Zero Hour\\ergc"
+#endif
 #define LAUNCHER_FILENAME			"Generals.exe"
 #define WORLDBUILDER_FILENAME		"WorldBuilder.exe"
 #define PATCHGET_FILENAME			"patchget.dat"

Core/Tools/Autorun/mouse.wav

@@ -0,0 +1 @@
+dummy

Core/Tools/CMakeLists.txt

@@ -20,3 +20,12 @@ if(RTS_BUILD_CORE_EXTRAS)
     add_subdirectory(wolSetup)
     add_subdirectory(WW3D)
 endif()
+
+# Add library interfaces here
+if(RTS_BUILD_GENERALS_TOOLS OR RTS_BUILD_ZEROHOUR_TOOLS)
+endif()
+
+# Add library interfaces here
+if(RTS_BUILD_GENERALS_EXTRAS OR RTS_BUILD_ZEROHOUR_EXTRAS)
+    add_subdirectory(Autorun)
+endif()

Generals/Code/CMakeLists.txt

@@ -19,6 +19,10 @@ target_include_directories(gi_libraries_source_wwvegas_ww3d2 INTERFACE "Librarie
 target_include_directories(gi_libraries_source_wwvegas_wwmath INTERFACE "Libraries/Source/WWVegas/WWMath")
 target_include_directories(gi_libraries_source_wwvegas_wwsaveload INTERFACE "Libraries/Source/WWVegas/WWSaveLoad")
 target_include_directories(gi_main INTERFACE "Main")
+
+target_compile_definitions(gi_always INTERFACE
+    RTS_GENERALS=1
+)
 target_link_libraries(gi_always INTERFACE
     core_utility
     gi_libraries_include