feat(macos): Full native macOS port via Apple Metal and 64-bit architecture refactor

.gitignore

@@ -65,4 +65,13 @@ build.ninja
 
 ## Python
 __pycache__/
-*.pyc
+
+CRCLogs/
+
+# Large Game Assets
+Data/*.big
+
+# Heavy Logs & Media
+Platform/MacOS/Build/Logs/
+*.gif
+

.vscode/launch.json

@@ -0,0 +1,30 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "macOS: Run build_run_mac.sh (Console)",
+            "type": "node-terminal",
+            "request": "launch",
+            "command": "sh build_run_mac.sh",
+            "cwd": "${workspaceFolder}"
+        },
+        {
+            "name": "macOS: Visual Debug C&C Generals",
+            "type": "cppdbg",
+            "request": "launch",
+            "program": "${workspaceFolder}/build/macos/GeneralsMD/GeneralsOnlineZH.app/Contents/MacOS/GeneralsOnlineZH",
+            "args": [
+                "-win"
+            ],
+            "cwd": "${workspaceFolder}",
+            "environment": [
+                { "name": "GENERALS_INSTALL_PATH", "value": "/Users/okji/dev/games/Command and Conquer - Generals/" },
+                { "name": "GENERALS_FPS_LIMIT", "value": "60" },
+                { "name": "GENERALS_MAC_DEBUG", "value": "1" }
+            ],
+            "MIMode": "lldb",
+            "preLaunchTask": "macOS: CMake Compile Only",
+            "externalConsole": false
+        }
+    ]
+}

.vscode/settings.json

@@ -0,0 +1,15 @@
+{
+
+    "editor.formatOnSave": false,
+    "terminal.integrated.fontSize": 12,
+    "terminal.integrated.fontFamily": "monospace",
+    "terminal.integrated.lineHeight": 1.2,
+    "terminal.integrated.cursorBlinking": true,
+    "terminal.integrated.cursorStyle": "line",
+    "terminal.integrated.fontWeight": "normal",
+    "terminal.integrated.fontWeightBold": "bold",
+    "terminal.integrated.defaultProfile.osx": "zsh",
+    "editor.rulers": [
+        120
+    ]
+}

.vscode/tasks.json

@@ -0,0 +1,56 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "macOS: Release Build + Launcher",
+            "type": "shell",
+            "command": "sh build_mac.sh --launcher",
+            "group": "build",
+            "presentation": {
+                "reveal": "always",
+                "panel": "new"
+            },
+            "problemMatcher": []
+        },
+        {
+            "label": "macOS: Clean Release Build + Launcher",
+            "type": "shell",
+            "command": "sh build_mac.sh --clean --launcher",
+            "group": "build",
+            "presentation": {
+                "reveal": "always",
+                "panel": "new"
+            },
+            "problemMatcher": []
+        },
+        {
+            "label": "macOS: Debug Build + Run",
+            "type": "shell",
+            "command": "sh build_run_mac.sh",
+            "group": "build",
+            "presentation": {
+                "reveal": "always",
+                "panel": "new"
+            },
+            "problemMatcher": []
+        },
+        {
+            "label": "macOS: Clean Debug Build + Run",
+            "type": "shell",
+            "command": "sh build_run_mac.sh --clean",
+            "group": "build",
+            "presentation": {
+                "reveal": "always",
+                "panel": "new"
+            },
+            "problemMatcher": []
+        },
+        {
+            "label": "macOS: CMake Compile Only",
+            "type": "shell",
+            "command": "cmake --build build/macos",
+            "group": "build",
+            "problemMatcher": []
+        }
+    ]
+}

CMakeLists.txt

@@ -33,6 +33,11 @@ endif()
 # Top level project, doesn't really affect anything.
 project(genzh LANGUAGES C CXX)
 
+if(APPLE)
+    enable_language(OBJCXX)
+    add_compile_options(-ffp-contract=off)
+endif()
+
 # This file handles extra settings wanted/needed for different compilers.
 include(cmake/compilers.cmake)
 
@@ -65,6 +70,8 @@ endif()
 include(cmake/config.cmake)
 include(cmake/gamespy.cmake)
 include(cmake/lzhl.cmake)
+include(cmake/curl.cmake)
+include(cmake/gns.cmake)
 
 if (IS_VS6_BUILD)
     # The original max sdk does not compile against a modern compiler.
@@ -81,6 +88,10 @@ endif()
 
 add_subdirectory(resources)
 
+if(APPLE)
+    add_subdirectory(Platform/MacOS)
+endif()
+
 add_subdirectory(Core)
 
 # Add main build targets

CMakePresets.json

@@ -207,6 +207,22 @@
             "cacheVariables": {
                 "RTS_BUILD_OPTION_PROFILE": "ON"
             }
+        },
+        {
+            "name": "macos",
+            "displayName": "macOS Release",
+            "generator": "Ninja",
+            "hidden": false,
+            "binaryDir": "${sourceDir}/build/${presetName}",
+            "cacheVariables": {
+                "CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
+                "CMAKE_BUILD_TYPE": "Release"
+            },
+            "condition": {
+                "type": "equals",
+                "lhs": "${hostSystemName}",
+                "rhs": "Darwin"
+            }
         }
     ],
     "buildPresets": [
@@ -306,6 +322,12 @@
             "configurePreset": "mingw-w64-i686-profile",
             "displayName": "Build MinGW-w64 32-bit (i686) Profile",
             "description": "Build MinGW-w64 32-bit (i686) Profile"
+        },
+        {
+            "name": "macos",
+            "configurePreset": "macos",
+            "displayName": "Build macOS Release",
+            "description": "Build macOS Release"
         }
     ],
     "workflowPresets": [
@@ -503,6 +525,19 @@
                     "name": "mingw-w64-i686-profile"
                 }
             ]
+        },
+        {
+            "name": "macos",
+            "steps": [
+                {
+                    "type": "configure",
+                    "name": "macos"
+                },
+                {
+                    "type": "build",
+                    "name": "macos"
+                }
+            ]
         }
     ]
 }

Core/GameEngine/CMakeLists.txt

@@ -553,7 +553,7 @@ set(GAMEENGINE_SRC
     Include/GameNetwork/RankPointValue.h
     Include/GameNetwork/Transport.h
     Include/GameNetwork/udp.h
-    Include/GameNetwork/User.h
+#    Include/GameNetwork/User.h
     Include/GameNetwork/WOLBrowser/FEBDispatch.h
     Include/GameNetwork/WOLBrowser/WebBrowser.h
 #    Include/Precompiled/PreRTS.h
@@ -679,6 +679,7 @@ set(GAMEENGINE_SRC
 #    Source/Common/System/Upgrade.cpp
     Source/Common/System/Xfer.cpp
     Source/Common/System/XferCRC.cpp
+    Source/Common/System/NativeFileSystem.cpp
     Source/Common/System/XferLoad.cpp
     Source/Common/System/XferSave.cpp
 #    Source/Common/TerrainTypes.cpp
@@ -1143,7 +1144,7 @@ set(GAMEENGINE_SRC
     Source/GameNetwork/Transport.cpp
     Source/GameNetwork/udp.cpp
     Source/GameNetwork/User.cpp
-    Source/GameNetwork/WOLBrowser/WebBrowser.cpp
+    # Source/GameNetwork/WOLBrowser/WebBrowser.cpp
 #    Source/Precompiled/PreRTS.cpp
 )
 
@@ -1191,11 +1192,16 @@ target_link_libraries(corei_gameengine_public INTERFACE
     core_compression
     core_browserdispatch
     #core_wwvegas
-    d3d8lib
     gamespy::gamespy
     stlport
 )
 
+if(NOT APPLE)
+    target_link_libraries(corei_gameengine_public INTERFACE
+        d3d8lib
+    )
+endif()
+
 # ReactOS ATL for MinGW-w64 only (MSVC uses native ATL)
 if(MINGW)
     target_link_libraries(corei_gameengine_public INTERFACE reactos_atl)

Core/GameEngine/Include/Common/Debug.h

@@ -257,3 +257,49 @@ class SimpleProfiler
 #endif
 
 // MACROS //////////////////////////////////////////////////////////////////
+
+
+
+#ifdef __APPLE__
+	#include <stdio.h>
+	#include <stdlib.h>
+
+	#define MAC_LOG_TAG(tag, m) do { \
+		printf("[" tag "] "); \
+		printf m; \
+		printf("\n"); \
+		fflush(stdout); \
+	} while(0)
+
+	#define DEBUG_CRASH_MAC(m) do { \
+		if (getenv("GENERALS_MAC_DEBUG") && atoi(getenv("GENERALS_MAC_DEBUG")) != 0) { \
+			MAC_LOG_TAG("DEBUG_CRASH_MAC", m); \
+		} \
+	} while(0)
+#else
+	#define MAC_LOG_TAG(tag, m) ((void)0)
+	#define DEBUG_CRASH_MAC(m) ((void)0)
+#endif
+
+#define DEBUG_BUILDMAPCACHE_FLAG
+#define DEBUG_INFO_MAC_FLAG
+#define DEBUG_FILESYSTEM_MAC_FLAG
+
+#ifdef DEBUG_BUILDMAPCACHE_FLAG
+	#define DEBUG_BUILDMAPCACHE(m) MAC_LOG_TAG("DEBUG_BUILDMAPCACHE", m)
+#else
+	#define DEBUG_BUILDMAPCACHE(m) ((void)0)
+#endif
+
+#ifdef DEBUG_INFO_MAC_FLAG
+	#define DEBUG_INFO_MAC(m) MAC_LOG_TAG("DEBUG_INFO_MAC", m)
+#else
+	#define DEBUG_INFO_MAC(m) ((void)0)
+#endif
+
+#ifdef DEBUG_FILESYSTEM_MAC_FLAG
+	#define DEBUG_FILESYSTEM_MAC(m) MAC_LOG_TAG("DEBUG_FILESYSTEM_MAC", m)
+#else
+	#define DEBUG_FILESYSTEM_MAC(m) ((void)0)
+#endif
+

Core/GameEngine/Include/Common/FileSystem.h

@@ -107,6 +107,10 @@ typedef UnsignedByte FileInstance;
 #endif
 
 
+#ifdef __APPLE__
+#define FileInfo RTSFileInfo
+#endif
+
 struct FileInfo {
 
 	Int64 size() const { return (Int64)sizeHigh << 32 | sizeLow; }

Core/GameEngine/Include/Common/GameCommon.h

@@ -290,17 +290,32 @@ const VeterancyLevelFlags VETERANCY_LEVEL_FLAGS_NONE = 0x00000000;
 
 inline Bool getVeterancyLevelFlag(VeterancyLevelFlags flags, VeterancyLevel dt)
 {
+#ifdef __APPLE__
+	UnsignedInt bit = (dt == 0) ? 31u : (UnsignedInt)(dt - 1);
+	return (flags & (1UL << bit)) != 0;
+#else
 	return (flags & (1UL << (dt - 1))) != 0;
+#endif
 }
 
 inline VeterancyLevelFlags setVeterancyLevelFlag(VeterancyLevelFlags flags, VeterancyLevel dt)
 {
+#ifdef __APPLE__
+	UnsignedInt bit = (dt == 0) ? 31u : (UnsignedInt)(dt - 1);
+	return (flags | (1UL << bit));
+#else
 	return (flags | (1UL << (dt - 1)));
+#endif
 }
 
 inline VeterancyLevelFlags clearVeterancyLevelFlag(VeterancyLevelFlags flags, VeterancyLevel dt)
 {
+#ifdef __APPLE__
+	UnsignedInt bit = (dt == 0) ? 31u : (UnsignedInt)(dt - 1);
+	return (flags & ~(1UL << bit));
+#else
 	return (flags & ~(1UL << (dt - 1)));
+#endif
 }
 
 // ----------------------------------------------------------------------------------------------

Core/GameEngine/Include/Common/GameDefines.h

@@ -41,18 +41,6 @@
 #endif
 #endif
 
-// This is here to easily toggle between the retail compatible with fixed pathfinding fallback and pure fixed pathfinding mode
-#if RETAIL_COMPATIBLE_CRC
-
-#if defined(GENERALS_ONLINE)
-#define RETAIL_COMPATIBLE_PATHFINDING (0)
-#else
-#define RETAIL_COMPATIBLE_PATHFINDING (1)
-#endif
-#else
-#define RETAIL_COMPATIBLE_PATHFINDING (0)
-#endif
-
 // This is here to easily toggle between the retail compatible pathfinding memory allocation and the new static allocated data mode
 #ifndef RETAIL_COMPATIBLE_PATHFINDING_ALLOCATION
 #if defined(GENERALS_ONLINE)
@@ -73,11 +61,6 @@
 #define RETAIL_COMPATIBLE_CIRCLE_FILL_ALGORITHM (1) // Use the original circle fill algorithm, which is more efficient but less accurate
 #endif
 
-// Disable non retail fixes in the networking, such as putting more data per UDP packet
-#ifndef RETAIL_COMPATIBLE_NETWORKING
-#define RETAIL_COMPATIBLE_NETWORKING (1)
-#endif
-
 // This is essentially synonymous for RETAIL_COMPATIBLE_CRC. There is a lot wrong with AIGroup, such as use-after-free, double-free, leaks,
 // but we cannot touch it much without breaking retail compatibility. Do not shy away from using massive hacks when fixing issues with AIGroup,
 // but put them behind this macro.