MacOS ARM support <3

.github/workflows/cmake-macos.yml

@@ -0,0 +1,46 @@
+name: CMake MacOS Build
+
+on: [push, pull_request, workflow_dispatch]
+
+env:
+  BUILD_TYPE: Release
+
+jobs:
+  macos-build:
+    runs-on: macos-latest
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+            submodules: 'true'
+
+      - name: Restore artifacts, or run vcpkg, build and cache artifacts
+        uses: lukka/run-vcpkg@v7
+        id: runvcpkg
+        with:
+            vcpkgArguments: 'zlib:arm64-osx nlohmann-json:arm64-osx openssl:arm64-osx cpp-httplib[openssl]:arm64-osx curl:arm64-osx'
+            vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
+            vcpkgGitCommitId: '40616a5e954f7be1077ef37db3fbddbd5dcd1ca6'
+
+      - name: Create Build Environment
+        run: cmake -E make_directory ${{github.workspace}}/build-macos
+
+      - name: Configure CMake
+        shell: bash
+        working-directory: ${{github.workspace}}/build-macos
+        run: |
+          cmake $GITHUB_WORKSPACE \
+            -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
+            -DCMAKE_TOOLCHAIN_FILE='${{ runner.workspace }}/b/vcpkg/scripts/buildsystems/vcpkg.cmake' \
+            -DCMAKE_OSX_ARCHITECTURES=arm64
+
+      - name: Build
+        working-directory: ${{github.workspace}}/build-macos
+        shell: bash
+        run: cmake --build . --config $BUILD_TYPE
+
+      - name: Archive artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: BeamMP-Launcher
+          path: ${{github.workspace}}/build-macos/BeamMP-Launcher

.gitignore

@@ -13,3 +13,13 @@ bin/
 compile_commands.json
 key
 out/
+build/
+.vscode/
+vcpkg/
+vcpkg_installed/
+CMakeFiles/
+cmake_install.cmake
+CMakeCache.txt
+Makefile
+BeamMP-Launcher
+.DS_Store

CMakeLists.txt

@@ -6,6 +6,8 @@ if (WIN32)
     message(STATUS "MSVC -> forcing use of statically-linked runtime.")
     STRING(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE})
     STRING(REPLACE "/MDd" "/MTd" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG})
+elseif(APPLE)
+    set(CMAKE_OSX_ARCHITECTURES "arm64" CACHE STRING "Build architectures for MacOS" FORCE)
 endif(WIN32)
 
 set(CMAKE_CXX_STANDARD 20)
@@ -32,6 +34,11 @@ elseif (LINUX)
     find_package(OpenSSL REQUIRED)
     target_link_libraries(${PROJECT_NAME} PRIVATE
             ZLIB::ZLIB OpenSSL::SSL OpenSSL::Crypto CURL::libcurl)
+elseif(APPLE)
+    find_package(ZLIB REQUIRED)
+    find_package(OpenSSL REQUIRED)
+    target_link_libraries(${PROJECT_NAME} PRIVATE
+            ZLIB::ZLIB OpenSSL::SSL OpenSSL::Crypto CURL::libcurl)
 else(WIN32) #MINGW
     add_definitions("-D_WIN32_WINNT=0x0600")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Os -s --static")

include/Network/network.hpp

@@ -16,6 +16,10 @@
 #include <sys/ucontext.h>
 #endif
 
+#ifdef __APPLE__
+#include "linuxfixes.h"
+#endif
+
 void NetReset();
 extern bool Dev;
 extern int ping;

include/Options.h

@@ -5,7 +5,7 @@
 struct Options {
 #if defined(_WIN32)
     std::string executable_name = "BeamMP-Launcher.exe";
-#elif defined(__linux__)
+#elif defined(__linux__) || defined(__APPLE__)
     std::string executable_name = "BeamMP-Launcher";
 #endif
     unsigned int port = 4444;
@@ -15,6 +15,10 @@ struct Options {
     bool no_launch = false;
     const char **game_arguments = nullptr;
     int game_arguments_length = 0;
+#if defined(__APPLE__)
+    std::string bottle;
+    std::string bottle_path;
+#endif
     const char** argv = nullptr;
     int argc = 0;
 };

include/Security/Init.h

@@ -11,5 +11,9 @@ void PreGame(const std::string& GamePath);
 std::string CheckVer(const std::string& path);
 void InitGame(const std::string& Dir);
 std::string GetGameDir();
+#if defined(__APPLE__) 
+std::string GetBottlePath();
+std::string GetBottleName();
+#endif
 void LegitimacyCheck();
 void CheckLocalKey();

include/Utils.h

@@ -1,6 +1,7 @@
 #pragma once
 #include <string>
 #include <vector>
+#include <algorithm>
 
 namespace Utils {
     inline std::vector<std::string> Split(const std::string& String, const std::string& delimiter) {
@@ -16,5 +17,27 @@ namespace Utils {
         if (!s.empty())
             Val.push_back(s);
         return Val;
-    };
-};
+    }
+
+    inline std::string ToLower(const std::string& str) {
+        std::string lowerStr = str;
+        std::transform(str.begin(), str.end(), lowerStr.begin(), ::tolower);
+        return lowerStr;
+    }
+
+    #if defined(__APPLE__)
+        inline std::pair<std::string, int> runCommand(const char* cmd) {
+            std::array<char, 128> buffer;
+            std::string result;
+            std::unique_ptr<FILE, decltype(&pclose)> pipe(popen(cmd, "r"), pclose);
+            if (!pipe) {
+                throw std::runtime_error("failed to run popen()");
+            }
+            while (fgets(buffer.data(), static_cast<int>(buffer.size()), pipe.get()) != nullptr) {
+                result += buffer.data();
+            }    
+            int returnCode = pclose(pipe.release());
+            return { result, returnCode };
+        }
+    #endif
+}

src/GameStart.cpp

@@ -9,7 +9,7 @@
 #if defined(_WIN32)
 #include <windows.h>
 #include <shlobj.h>
-#elif defined(__linux__)
+#elif defined(__linux__) || defined(__APPLE__)
 #include "vdf_parser.hpp"
 #include <pwd.h>
 #include <spawn.h>
@@ -24,6 +24,7 @@
 #include <filesystem>
 #include <thread>
 #include "Options.h"
+#include "Utils.h"
 
 unsigned long GamePID = 0;
 #if defined(_WIN32)
@@ -73,6 +74,15 @@ std::string GetGamePath() {
     Path += Ver + "/";
     return Path;
 }
+#elif defined(__APPLE__)
+std::string GetGamePath() {
+    std::string BottlePath = GetBottlePath();
+    std::string Path = BottlePath + "/drive_c/users/crossover/AppData/Local/BeamNG.drive/";
+    std::string Ver = CheckVer(GetGameDir());
+    Ver = Ver.substr(0, Ver.find('.', Ver.find('.') + 1));
+    Path += Ver + "/";
+    return Path;
+}
 #endif
 
 #if defined(_WIN32)
@@ -132,6 +142,74 @@ void StartGame(std::string Dir) {
     std::this_thread::sleep_for(std::chrono::seconds(5));
     exit(2);
 }
+
+#elif defined(__APPLE__)
+void StartGame(std::string Dir) {
+    extern char **environ;
+    int status;
+
+    std::string executable = Dir + "/Bin64/BeamNG.drive.x64.exe";
+    if (!std::filesystem::exists(executable)) {
+        error("The executable BeamNG.drive.x64.exe doesn't exist in folder: " + Dir + "/Bin64/");
+        exit(1);
+    }
+    std::pair<std::string, int> sharedCmd = Utils::runCommand("mdfind kMDItemCFBundleIdentifier = 'com.codeweavers.CrossOver'");
+    std::string sharedPath = sharedCmd.first;
+    int statusCode = sharedCmd.second;
+    if (statusCode != 0) {
+        error("Failed to detect SharedSupport folder, please make sure CrossOver is installed.");
+        exit(1);
+    } else {
+        std::istringstream stream(sharedPath);
+        std::string line;
+        std::vector<std::string> paths;
+        while (std::getline(stream, line)) {
+            if (line.find("CrossOver.app") != std::string::npos) {
+                paths.push_back(line);
+            }
+        }
+        if (paths.empty()) {
+            error("No valid CrossOver.app found.");
+            exit(1);
+        } else if (paths.size() > 1) {
+            debug("Multiple CrossOver.app found, using the first one.");
+        }
+        sharedPath = paths[0];
+        sharedPath += "/";
+    }
+
+    std::string wineExecutable = sharedPath + "Contents/SharedSupport/CrossOver/bin/wine";
+    std::string bottlePath = GetBottlePath();
+    std::vector<const char*> argv;
+    argv.push_back(wineExecutable.c_str());
+    argv.push_back("--bottle");
+    argv.push_back(bottlePath.c_str());
+    argv.push_back(executable.c_str());
+
+    for (int i = 0; i < options.game_arguments_length; i++) {
+        argv.push_back(options.game_arguments[i]);
+    }
+    argv.push_back(nullptr);
+
+    pid_t pid;
+    posix_spawn_file_actions_t spawn_actions;
+    posix_spawn_file_actions_init(&spawn_actions);
+    posix_spawn_file_actions_addclose(&spawn_actions, STDOUT_FILENO);
+    posix_spawn_file_actions_addclose(&spawn_actions, STDERR_FILENO);
+
+    int result = posix_spawn(&pid, wineExecutable.c_str(), &spawn_actions, nullptr, const_cast<char**>(argv.data()), environ);
+
+    if (result != 0) {
+        error("Failed to Launch the game! launcher closing soon");
+        return;
+    } else {
+        waitpid(pid, &status, 0);
+        info("Game Closed! launcher closing soon");
+    }
+
+    std::this_thread::sleep_for(std::chrono::seconds(5));
+    exit(2);
+}
 #endif
 
 void InitGame(const std::string& Dir) {

src/Network/Core.cpp

@@ -13,7 +13,7 @@
 #if defined(_WIN32)
 #include <winsock2.h>
 #include <ws2tcpip.h>
-#elif defined(__linux__)
+#elif defined(__linux__) || defined(__APPLE__)
 #include <cstring>
 #include <errno.h>
 #include <netdb.h>
@@ -372,21 +372,19 @@ int Handle(EXCEPTION_POINTERS* ep) {
 
 [[noreturn]] void CoreNetwork() {
     while (true) {
-#if not defined(__MINGW32__)
+#if defined(_WIN32)
         __try {
-#endif
-
             CoreMain();
-
-#if not defined(__MINGW32__) and not defined(__linux__)
         } __except (Handle(GetExceptionInformation())) { }
-#elif not defined(__MINGW32__) and defined(__linux__)
-    }
-    catch (...) {
-        except("(Core) Code : " + std::string(strerror(errno)));
-    }
+#else
+        try {
+            CoreMain();
+        } catch (const std::exception& e) {
+            error("(Core) Exception: " + std::string(e.what()));
+        } catch (...) {
+            error("(Core) Unknown exception");
+        }
 #endif
-
         std::this_thread::sleep_for(std::chrono::seconds(1));
     }
-}
+}

src/Network/DNS.cpp

@@ -10,7 +10,7 @@
 
 #if defined(_WIN32)
 #include <winsock2.h>
-#elif defined(__linux__)
+#elif defined(__linux__) || defined(__APPLE__)
 #include "linuxfixes.h"
 #include <arpa/inet.h>
 #include <netdb.h>

src/Network/GlobalHandler.cpp

@@ -11,7 +11,7 @@
 #if defined(_WIN32)
 #include <winsock2.h>
 #include <ws2tcpip.h>
-#elif defined(__linux__)
+#elif defined(__linux__) || defined(__APPLE__)
 #include "linuxfixes.h"
 #include <arpa/inet.h>
 #include <cstring>

src/Network/Resources.cpp

@@ -17,7 +17,7 @@
 
 #if defined(_WIN32)
 #include <ws2tcpip.h>
-#elif defined(__linux__)
+#elif defined(__linux__) || defined(__APPLE__)
 #include <arpa/inet.h>
 #include <cstring>
 #include <errno.h>
@@ -35,7 +35,6 @@
 #include <filesystem>
 #include <fstream>
 #include <future>
-#include <iostream>
 #include <thread>
 
 #include "hashpp.h"

src/Network/VehicleData.cpp

@@ -11,7 +11,7 @@
 
 #if defined(_WIN32)
 #include <ws2tcpip.h>
-#elif defined(__linux__)
+#elif defined(__linux__) || defined(__APPLE__)
 #include "linuxfixes.h"
 #include <arpa/inet.h>
 #include <cstring>
@@ -66,7 +66,7 @@ void UDPRcv() {
     sockaddr_in FromServer {};
 #if defined(_WIN32)
     int clientLength = sizeof(FromServer);
-#elif defined(__linux__)
+#elif defined(__linux__) || defined(__APPLE__)
     socklen_t clientLength = sizeof(FromServer);
 #endif
     ZeroMemory(&FromServer, clientLength);

src/Network/VehicleEvent.cpp

@@ -14,7 +14,7 @@
 
 #if defined(_WIN32)
 #include <ws2tcpip.h>
-#elif defined(__linux__)
+#elif defined(__linux__) || defined(__APPLE__)
 #include <arpa/inet.h>
 #include <cstring>
 #include <errno.h>