build: Add MinGW-w64 32-bit (i686) cross-compilation support

CMakeLists.txt

@@ -36,8 +36,18 @@ project(genzh LANGUAGES C CXX)
 # This file handles extra settings wanted/needed for different compilers.
 include(cmake/compilers.cmake)
 
+# Debug symbol stripping for Release builds (MinGW)
+include(cmake/debug_strip.cmake)
+
 include(FetchContent)
 
+# MinGW-w64 specific configuration
+if(MINGW)
+    include(cmake/mingw.cmake)
+    include(cmake/reactos-atl.cmake)
+    include(cmake/widl.cmake)
+endif()
+
 # Find/Add build dependencies and stubs shared by all projects
 if((WIN32 OR "${CMAKE_SYSTEM}" MATCHES "Windows") AND ${CMAKE_SIZEOF_VOID_P} EQUAL 4)
     include(cmake/miles.cmake)

CMakePresets.json

@@ -159,6 +159,37 @@
             "inherits": "default-vcpkg",
             "hidden": false,
             "displayName": "Unix 32bit VCPKG Release"
+        },
+        {
+            "name": "mingw-w64-i686",
+            "displayName": "MinGW-w64 32-bit (i686) Release",
+            "generator": "Unix Makefiles",
+            "hidden": false,
+            "binaryDir": "${sourceDir}/build/${presetName}",
+            "toolchainFile": "${sourceDir}/cmake/toolchains/mingw-w64-i686.cmake",
+            "cacheVariables": {
+                "CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
+                "CMAKE_BUILD_TYPE": "Release"
+            }
+        },
+        {
+            "name": "mingw-w64-i686-debug",
+            "displayName": "MinGW-w64 32-bit (i686) Debug",
+            "hidden": false,
+            "inherits": "mingw-w64-i686",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Debug",
+                "RTS_BUILD_OPTION_DEBUG": "ON"
+            }
+        },
+        {
+            "name": "mingw-w64-i686-profile",
+            "displayName": "MinGW-w64 32-bit (i686) Profile",
+            "hidden": false,
+            "inherits": "mingw-w64-i686",
+            "cacheVariables": {
+                "RTS_BUILD_OPTION_PROFILE": "ON"
+            }
         }
     ],
     "buildPresets": [
@@ -240,6 +271,24 @@
             "displayName": "Build Unix 32bit VCPKG Release",
             "description": "Build Unix 32bit VCPKG Release",
             "configuration": "Release"
+        },
+        {
+            "name": "mingw-w64-i686",
+            "configurePreset": "mingw-w64-i686",
+            "displayName": "Build MinGW-w64 32-bit (i686) Release",
+            "description": "Build MinGW-w64 32-bit (i686) Release"
+        },
+        {
+            "name": "mingw-w64-i686-debug",
+            "configurePreset": "mingw-w64-i686-debug",
+            "displayName": "Build MinGW-w64 32-bit (i686) Debug",
+            "description": "Build MinGW-w64 32-bit (i686) Debug"
+        },
+        {
+            "name": "mingw-w64-i686-profile",
+            "configurePreset": "mingw-w64-i686-profile",
+            "displayName": "Build MinGW-w64 32-bit (i686) Profile",
+            "description": "Build MinGW-w64 32-bit (i686) Profile"
         }
     ],
     "workflowPresets": [
@@ -398,6 +447,45 @@
                     "name": "unix"
                 }
             ]
+        },
+        {
+            "name": "mingw-w64-i686",
+            "steps": [
+                {
+                    "type": "configure",
+                    "name": "mingw-w64-i686"
+                },
+                {
+                    "type": "build",
+                    "name": "mingw-w64-i686"
+                }
+            ]
+        },
+        {
+            "name": "mingw-w64-i686-debug",
+            "steps": [
+                {
+                    "type": "configure",
+                    "name": "mingw-w64-i686-debug"
+                },
+                {
+                    "type": "build",
+                    "name": "mingw-w64-i686-debug"
+                }
+            ]
+        },
+        {
+            "name": "mingw-w64-i686-profile",
+            "steps": [
+                {
+                    "type": "configure",
+                    "name": "mingw-w64-i686-profile"
+                },
+                {
+                    "type": "build",
+                    "name": "mingw-w64-i686-profile"
+                }
+            ]
         }
     ]
 }

Core/GameEngine/CMakeLists.txt

@@ -1198,3 +1198,8 @@ target_link_libraries(corei_gameengine_public INTERFACE
     gamespy::gamespy
     stlport
 )
+
+# ReactOS ATL for MinGW-w64 only (MSVC uses native ATL)
+if(MINGW)
+    target_link_libraries(corei_gameengine_public INTERFACE reactos_atl)
+endif()

Core/GameEngine/Include/GameNetwork/WOLBrowser/FEBDispatch.h

@@ -29,6 +29,11 @@
 
 #pragma once
 
+#if defined __MINGW32__
+#include "Utility/atl_compat.h"
+#include "Utility/comsupp_compat.h" 
+#endif
+
 #include <atlbase.h>
 extern CComModule _Module;
 #include <atlcom.h>

Core/GameEngine/Source/Common/System/MiniDumper.cpp

@@ -93,6 +93,8 @@ void MiniDumper::TriggerMiniDump(DumpType dumpType)
 		return;
 	}
 
+#if defined(_MSC_VER)
+	// MSVC supports structured exception handling (__try/__except)
 	__try
 	{
 		// Use DebugBreak to raise an exception that can be caught in the __except block
@@ -102,6 +104,13 @@ void MiniDumper::TriggerMiniDump(DumpType dumpType)
 	{
 		TriggerMiniDumpForException(g_dumpException, dumpType);
 	}
+#elif defined(__GNUC__) && defined(_WIN32)
+	// GCC/MinGW-w64 doesn't support MSVC's __try/__except syntax
+	// Trigger dump directly without SEH support
+	DEBUG_LOG(("MiniDumper::TriggerMiniDump: SEH not supported on this compiler, skipping manual dump trigger."));
+#else
+	#error "MiniDumper::TriggerMiniDump: Unsupported compiler. This code requires MSVC or GCC/MinGW-w64 targeting Windows."
+#endif
 }
 
 void MiniDumper::TriggerMiniDumpForException(_EXCEPTION_POINTERS* e_info, DumpType dumpType)

Core/GameEngine/Source/Common/System/XferCRC.cpp

@@ -34,7 +34,7 @@
 #include "Common/XferDeepCRC.h"
 #include "Common/crc.h"
 #include "Common/Snapshot.h"
-#include "utility/endian_compat.h"
+#include "Utility/endian_compat.h"
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------

Core/GameEngineDevice/Include/W3DDevice/GameClient/WorldHeightMap.h

@@ -91,6 +91,8 @@ class InputStream;
 class OutputStream;
 class DataChunkInput;
 struct DataChunkInfo;
+class TerrainTextureClass;
+class AlphaTerrainTextureClass;
 class AlphaEdgeTextureClass;
 
 #define NUM_ALPHA_TILES 12

Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DView.cpp

@@ -757,7 +757,7 @@ void drawDebugCircle( const Coord3D & center, Real radius, Real width, Color col
   }
 }
 
-void drawDrawableExtents( Drawable *draw, void *userData );  // FORWARD DECLARATION
+static void drawDrawableExtents( Drawable *draw, void *userData );  // FORWARD DECLARATION
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 static void drawContainedDrawable( Object *obj, void *userData )
@@ -867,7 +867,7 @@ static void drawDrawableExtents( Drawable *draw, void *userData )
 }
 
 
-void drawAudioLocations( Drawable *draw, void *userData );
+static void drawAudioLocations( Drawable *draw, void *userData );
 // ------------------------------------------------------------------------------------------------
 // Helper for drawAudioLocations
 // ------------------------------------------------------------------------------------------------

Core/GameEngineDevice/Source/W3DDevice/GameClient/Water/W3DWaterTracks.cpp

@@ -1083,7 +1083,7 @@ extern HWND ApplicationHWnd;
 //TODO: Fix editor so it actually draws the wave segment instead of line while editing
 //Could freeze all the water while editing?  Or keep setting elapsed time on current segment.
 //Have to make it so seamless merge of segments at final position.
-static void TestWaterUpdate(void)
+void TestWaterUpdate(void)
 {
 	static Int doInit=1;
 	static WaterTracksObj *track=nullptr,*track2=nullptr;

Core/Libraries/Include/Lib/BaseTypeCore.h

@@ -92,12 +92,12 @@
 //#define abs(x) (((x) < 0) ? -(x) : (x))
 //#endif
 
-#ifndef min
-#define min(x,y) (((x)<(y)) ? (x) : (y))
+#ifndef MIN
+#define MIN(x,y) (((x)<(y)) ? (x) : (y))
 #endif
 
-#ifndef max
-#define max(x,y) (((x)>(y)) ? (x) : (y))
+#ifndef MAX
+#define MAX(x,y) (((x)>(y)) ? (x) : (y))
 #endif
 
 #ifndef TRUE

Core/Libraries/Source/Compression/LZHCompress/NoxCompress.cpp

@@ -164,7 +164,7 @@ Bool CompressFile			(char *infile, char *outfile)
 		compressor = LZHLCreateCompressor();
 		for ( i = 0; i < rawSize; i += BLOCKSIZE )
 		{
-			blocklen = min((UnsignedInt)BLOCKSIZE, rawSize - i);
+			blocklen = MIN((UnsignedInt)BLOCKSIZE, rawSize - i);
 			compressed = LZHLCompress(compressor, outBlock + compressedSize, inBlock + i, blocklen);
 			compressedSize += compressed;
 		}
@@ -282,7 +282,7 @@ Bool CompressMemory			(void *inBufferVoid, Int inSize, void *outBufferVoid, Int&
 	compressor = LZHLCreateCompressor();
 	for ( i = 0; i < rawSize; i += BLOCKSIZE )
 	{
-		blocklen = min((UnsignedInt)BLOCKSIZE, rawSize - i);
+		blocklen = MIN((UnsignedInt)BLOCKSIZE, rawSize - i);
 		compressed = LZHLCompress(compressor, outBuffer + compressedSize, inBuffer + i, blocklen);
 		compressedSize += compressed;
 	}

Core/Libraries/Source/EABrowserDispatch/CMakeLists.txt

@@ -1,16 +1,32 @@
 add_library(core_browserdispatch INTERFACE)
 
 if(WIN32 OR "${CMAKE_SYSTEM}" MATCHES "Windows")
-    add_custom_command(
-        OUTPUT BrowserDispatch_i.c BrowserDispatch.h
-        COMMAND midl.exe "${CMAKE_CURRENT_LIST_DIR}\\BrowserDispatch.idl" /header BrowserDispatch.h
-        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-        DEPENDS "${CMAKE_CURRENT_LIST_DIR}/BrowserDispatch.idl"
-        VERBATIM
-    )
-    add_library(core_browserdispatchwin STATIC BrowserDispatch_i.c)
-    set_target_properties(core_browserdispatchwin PROPERTIES OUTPUT_NAME browserdispatchwin)
-    target_link_libraries(core_browserdispatch INTERFACE core_browserdispatchwin)
+    if(MINGW AND IDL_COMPILER_FOUND)
+        # Use widl for MinGW builds
+        add_idl_file(browserdispatch_idl "${CMAKE_CURRENT_LIST_DIR}/BrowserDispatch.idl")
+        add_library(core_browserdispatchwin STATIC ${browserdispatch_idl_IID} ${browserdispatch_idl_HEADER})
+    elseif(MSVC)
+        # Use midl for MSVC builds
+        add_custom_command(
+            OUTPUT BrowserDispatch_i.c BrowserDispatch.h
+            COMMAND midl.exe "${CMAKE_CURRENT_LIST_DIR}\\BrowserDispatch.idl" /header BrowserDispatch.h /iid BrowserDispatch_i.c
+            WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+            DEPENDS "${CMAKE_CURRENT_LIST_DIR}/BrowserDispatch.idl"
+            VERBATIM
+        )
+        add_library(core_browserdispatchwin STATIC BrowserDispatch_i.c)
+    else()
+        message(FATAL_ERROR 
+            "EABrowserDispatch requires an IDL compiler for Windows builds:\n"
+            "  - For MinGW: Install widl (apt-get install wine-stable-dev)\n"
+            "  - For MSVC: midl.exe should be in PATH\n"
+            "  - For other compilers: Not currently supported")
+    endif()
+
+    if(TARGET core_browserdispatchwin)
+        set_target_properties(core_browserdispatchwin PROPERTIES OUTPUT_NAME browserdispatchwin)
+        target_link_libraries(core_browserdispatch INTERFACE core_browserdispatchwin)
+    endif()
 endif()
 
 target_include_directories(core_browserdispatch INTERFACE ${CMAKE_CURRENT_BINARY_DIR}/..)

Core/Libraries/Source/EABrowserEngine/CMakeLists.txt

@@ -1,16 +1,32 @@
 add_library(core_browserengine INTERFACE)
 
 if(WIN32 OR "${CMAKE_SYSTEM}" MATCHES "Windows")
-    add_custom_command(
-        OUTPUT BrowserEngine_i.c BrowserEngine.h
-        COMMAND midl.exe "${CMAKE_CURRENT_LIST_DIR}\\BrowserEngine.idl" /header BrowserEngine.h
-        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-        DEPENDS "${CMAKE_CURRENT_LIST_DIR}/BrowserEngine.idl"
-        VERBATIM
-    )
-    add_library(core_browserenginewin STATIC BrowserEngine_i.c)
-    set_target_properties(core_browserenginewin PROPERTIES OUTPUT_NAME browserenginewin)
-    target_link_libraries(core_browserengine INTERFACE core_browserenginewin)
+    if(MINGW AND IDL_COMPILER_FOUND)
+        # Use widl for MinGW builds
+        add_idl_file(browserengine_idl "${CMAKE_CURRENT_LIST_DIR}/BrowserEngine.idl")
+        add_library(core_browserenginewin STATIC ${browserengine_idl_IID} ${browserengine_idl_HEADER})
+    elseif(MSVC)
+        # Use midl for MSVC builds
+        add_custom_command(
+            OUTPUT BrowserEngine_i.c BrowserEngine.h
+            COMMAND midl.exe "${CMAKE_CURRENT_LIST_DIR}\\BrowserEngine.idl" /header BrowserEngine.h /iid BrowserEngine_i.c
+            WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+            DEPENDS "${CMAKE_CURRENT_LIST_DIR}/BrowserEngine.idl"
+            VERBATIM
+        )
+        add_library(core_browserenginewin STATIC BrowserEngine_i.c)
+    else()
+        message(FATAL_ERROR 
+            "EABrowserEngine requires an IDL compiler for Windows builds:\n"
+            "  - For MinGW: Install widl (apt-get install wine-stable-dev)\n"
+            "  - For MSVC: midl.exe should be in PATH\n"
+            "  - For other compilers: Not currently supported")
+    endif()
+
+    if(TARGET core_browserenginewin)
+        set_target_properties(core_browserenginewin PROPERTIES OUTPUT_NAME browserenginewin)
+        target_link_libraries(core_browserengine INTERFACE core_browserenginewin)
+    endif()
 endif()
 
 target_include_directories(core_browserengine INTERFACE ${CMAKE_CURRENT_BINARY_DIR}/..)

Core/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt

@@ -237,12 +237,14 @@ add_library(corei_ww3d2 INTERFACE)
 
 target_sources(corei_ww3d2 INTERFACE ${WW3D2_SRC})
 
-if (NOT IS_VS6_BUILD)
+if (MSVC AND NOT IS_VS6_BUILD)
     target_link_libraries(corei_ww3d2 INTERFACE
         comsuppw
     )
 endif()
 
 target_link_libraries(corei_ww3d2 INTERFACE
     core_browserengine
+    core_wwlib
+    core_wwmath
 )

Core/Libraries/Source/WWVegas/WW3D2/dx8webbrowser.cpp

@@ -46,6 +46,9 @@
 
 #else
 
+#ifdef __MINGW32__
+#include "Utility/comsupp_compat.h"  // MinGW COM support compatibility
+#endif
 #include <comutil.h>
 #include <comip.h>
 

Core/Libraries/Source/WWVegas/WW3D2/missingtexture.cpp

@@ -162,7 +162,7 @@ void MissingTexture::_Deinit()
 	_MissingTexture=nullptr;
 }
 
-static unsigned int missing_image_palette[]={
+unsigned int missing_image_palette[]={
 0x7F040204,0x7F048AC4,0x7F84829C,0x7FFC0204,0x7F0442AB,0x7FFCFE04,0x7F444244,0x7F0462FC,
 0x7F84CEE4,0x7FC4C6CF,0x7F9CA6B2,0x7FC4E6F4,0x7F04FE04,0x7F4C82D4,0x7F2452A1,0x7F0442D4,
 0x7F446AB0,0x7FA4A6B6,0x7F2C62C2,0x7FE4E6E9,0x7F646264,0x7F0402FC,0x7FC4D6E1,0x7F44B6DC,
@@ -196,7 +196,7 @@ static unsigned int missing_image_palette[]={
 0x7FACDEEC,0x7F2CA6D4,0x7F0452E4,0x7FD4D6E4,0x7F849ED4,0x7FB4B6CC,0x7F4C7ACC,0x7FACC6FC,
 0x7F9496B4,0x7F042AA4,0x7F1C62E4,0x7F74A6EC,0x7FE4EEFC,0x7F1C72FC,0x7FD4DEEC,0x7F2C5ABC};
 
-static unsigned int missing_image_pixels[]={
+unsigned int missing_image_pixels[]={
 0x03030303,0x03030303,0xA7A7A7A7,0xA7A7A7A7,0xA7A7A7A7,0xA7A7A7A7,0xA7A7A7A7,0xA7A7A7A7,
 0xA7A7A7A7,0xA7A7A7A7,0xA7A7A7A7,0xA7A7A7A7,0xA7A7A7A7,0xA7A7A7A7,0xA7A7A7A7,0xA7A7A7A7,
 0xA7A7A7A7,0xA7A7A7A7,0xA7A7A7A7,0xA7A7A7A7,0xA7A7A7A7,0xA7A7A7A7,0xA7A7A7A7,0xA7A7A7A7,

Core/Libraries/Source/WWVegas/WW3D2/texture.h

@@ -58,6 +58,7 @@ class DX8Wrapper;
 class TextureLoader;
 class LoaderThreadClass;
 class TextureLoadTaskClass;
+class TextureClass;
 class CubeTextureClass;
 class VolumeTextureClass;
 

Core/Libraries/Source/WWVegas/WW3D2/textureloader.h

@@ -45,6 +45,7 @@
 class StringClass;
 struct IDirect3DTexture8;
 class TextureLoadTaskClass;
+class TextureLoadTaskListClass;
 
 class TextureLoader
 {