MacOS ARM support <3 by enzofrnt · Pull Request #147 · BeamMP/BeamMP-Launcher

enzofrnt · 2024-11-08T13:54:21Z

Here is the support for MacOS on ARM64 using crossover (proton like but on Mac) <3

This pull request introduces support for building and running the project on macOS, alongside existing support for Windows and Linux. The changes include updates to the build configuration, source code modifications to handle macOS-specific functionality, and additional code to support macOS-specific paths and libraries.

Build Configuration:

Added a new GitHub Actions workflow for building the project on macOS using CMake. (.github/workflows/cmake-macos.yml)
Updated CMakeLists.txt to include macOS-specific build configurations and dependencies. [1] [2]

Source Code Modifications:

Updated various source files to include macOS-specific preprocessor directives and handle macOS-specific paths and libraries. [1] [2] [3] [4] [5] [6] [7] [8] [9]
Added macOS-specific implementations for functions in GameStart.cpp to handle game initialization and execution. [1] [2] [3]

Header File Updates:

Updated Options.h to include macOS in the platform-specific executable name definition.
Added macOS-specific function declarations in Security/Init.h.
Included additional headers and macOS-specific code in vdf_parser.hpp. [1] [2]

Additional Functionality:

Implemented macOS-specific functions for handling file paths and validating game installations in BeamNG.cpp. [1] [2] [3]

…P-Launcher into ghcw-session-d22d

```bash Book • ➜ ~/GithubRepo/BeamMP-Launcher git:(ghcw-session-d22d) ✗ cmake --build . --config $BUILD_TYPE [ 5%] Building CXX object CMakeFiles/Launcher.dir/src/GameStart.cpp.o In file included from /Users/enzofournet/GithubRepo/BeamMP-Launcher/src/GameStart.cpp:13: /Users/enzofournet/GithubRepo/BeamMP-Launcher/include/vdf_parser.hpp:134:43: warning: 'codecvt_utf8<wchar_t>' is deprecated [-Wdeprecated-declarations] 134 | std::wstring_convert<std::codecvt_utf8<wchar_t>> conv1; | ^ /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX15.0.sdk/usr/include/c++/v1/codecvt:194:28: note: 'codecvt_utf8<wchar_t>' has been explicitly marked deprecated here 194 | class _LIBCPP_TEMPLATE_VIS _LIBCPP_DEPRECATED_IN_CXX17 codecvt_utf8 : public __codecvt_utf8<_Elem> { | ^ /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX15.0.sdk/usr/include/c++/v1/__config:1022:41: note: expanded from macro '_LIBCPP_DEPRECATED_IN_CXX17' 1022 | # define _LIBCPP_DEPRECATED_IN_CXX17 _LIBCPP_DEPRECATED | ^ /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX15.0.sdk/usr/include/c++/v1/__config:995:49: note: expanded from macro '_LIBCPP_DEPRECATED' 995 | # define _LIBCPP_DEPRECATED __attribute__((__deprecated__)) | ^ In file included from /Users/enzofournet/GithubRepo/BeamMP-Launcher/src/GameStart.cpp:13: /Users/enzofournet/GithubRepo/BeamMP-Launcher/include/vdf_parser.hpp:134:22: warning: 'wstring_convert<std::codecvt_utf8<wchar_t>>' is deprecated [-Wdeprecated-declarations] 134 | std::wstring_convert<std::codecvt_utf8<wchar_t>> conv1; | ^ /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX15.0.sdk/usr/include/c++/v1/locale:3114:28: note: 'wstring_convert<std::codecvt_utf8<wchar_t>>' has been explicitly marked deprecated here 3114 | class _LIBCPP_TEMPLATE_VIS _LIBCPP_DEPRECATED_IN_CXX17 wstring_convert { | ^ /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX15.0.sdk/usr/include/c++/v1/__config:1022:41: note: expanded from macro '_LIBCPP_DEPRECATED_IN_CXX17' 1022 | # define _LIBCPP_DEPRECATED_IN_CXX17 _LIBCPP_DEPRECATED | ^ /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX15.0.sdk/usr/include/c++/v1/__config:995:49: note: expanded from macro '_LIBCPP_DEPRECATED' 995 | # define _LIBCPP_DEPRECATED __attribute__((__deprecated__)) | ^ 2 warnings generated. [ 11%] Building CXX object CMakeFiles/Launcher.dir/src/Security/BeamNG.cpp.o In file included from /Users/enzofournet/GithubRepo/BeamMP-Launcher/src/Security/BeamNG.cpp:13: /Users/enzofournet/GithubRepo/BeamMP-Launcher/include/vdf_parser.hpp:134:43: warning: 'codecvt_utf8<wchar_t>' is deprecated [-Wdeprecated-declarations] 134 | std::wstring_convert<std::codecvt_utf8<wchar_t>> conv1; | ^ /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX15.0.sdk/usr/include/c++/v1/codecvt:194:28: note: 'codecvt_utf8<wchar_t>' has been explicitly marked deprecated here 194 | class _LIBCPP_TEMPLATE_VIS _LIBCPP_DEPRECATED_IN_CXX17 codecvt_utf8 : public __codecvt_utf8<_Elem> { | ^ /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX15.0.sdk/usr/include/c++/v1/__config:1022:41: note: expanded from macro '_LIBCPP_DEPRECATED_IN_CXX17' 1022 | # define _LIBCPP_DEPRECATED_IN_CXX17 _LIBCPP_DEPRECATED | ^ /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX15.0.sdk/usr/include/c++/v1/__config:995:49: note: expanded from macro '_LIBCPP_DEPRECATED' 995 | # define _LIBCPP_DEPRECATED __attribute__((__deprecated__)) | ^ In file included from /Users/enzofournet/GithubRepo/BeamMP-Launcher/src/Security/BeamNG.cpp:13: /Users/enzofournet/GithubRepo/BeamMP-Launcher/include/vdf_parser.hpp:134:22: warning: 'wstring_convert<std::codecvt_utf8<wchar_t>>' is deprecated [-Wdeprecated-declarations] 134 | std::wstring_convert<std::codecvt_utf8<wchar_t>> conv1; | ^ /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX15.0.sdk/usr/include/c++/v1/locale:3114:28: note: 'wstring_convert<std::codecvt_utf8<wchar_t>>' has been explicitly marked deprecated here 3114 | class _LIBCPP_TEMPLATE_VIS _LIBCPP_DEPRECATED_IN_CXX17 wstring_convert { | ^ /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX15.0.sdk/usr/include/c++/v1/__config:1022:41: note: expanded from macro '_LIBCPP_DEPRECATED_IN_CXX17' 1022 | # define _LIBCPP_DEPRECATED_IN_CXX17 _LIBCPP_DEPRECATED | ^ /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX15.0.sdk/usr/include/c++/v1/__config:995:49: note: expanded from macro '_LIBCPP_DEPRECATED' 995 | # define _LIBCPP_DEPRECATED __attribute__((__deprecated__)) | ^ 2 warnings generated. [ 17%] Linking CXX executable BeamMP-Launcher ld: warning: ignoring duplicate libraries: 'vcpkg_installed/arm64-osx/lib/libz.a' [100%] Built target Launcher Book • ➜ ~/GithubRepo/BeamMP-Launcher git:(ghcw-session-d22d) ✗ Book • ➜ ~/GithubRepo/BeamMP-Launcher git:(ghcw-session-d22d) ✗ cmake --build . --config $BUILD_TYPE [ 5%] Building CXX object CMakeFiles/Launcher.dir/src/GameStart.cpp.o In file included from /Users/enzofournet/GithubRepo/BeamMP-Launcher/src/GameStart.cpp:13: /Users/enzofournet/GithubRepo/BeamMP-Launcher/include/vdf_parser.hpp:134:43: warning: 'codecvt_utf8<wchar_t>' is deprecated [-Wdeprecated-declarations] 134 | std::wstring_convert<std::codecvt_utf8<wchar_t>> conv1; | ^ /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX15.0.sdk/usr/include/c++/v1/codecvt:194:28: note: 'codecvt_utf8<wchar_t>' has been explicitly marked deprecated here 194 | class _LIBCPP_TEMPLATE_VIS _LIBCPP_DEPRECATED_IN_CXX17 codecvt_utf8 : public __codecvt_utf8<_Elem> { | ^ /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX15.0.sdk/usr/include/c++/v1/__config:1022:41: note: expanded from macro '_LIBCPP_DEPRECATED_IN_CXX17' 1022 | # define _LIBCPP_DEPRECATED_IN_CXX17 _LIBCPP_DEPRECATED | ^ /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX15.0.sdk/usr/include/c++/v1/__config:995:49: note: expanded from macro '_LIBCPP_DEPRECATED' 995 | # define _LIBCPP_DEPRECATED __attribute__((__deprecated__)) | ^ In file included from /Users/enzofournet/GithubRepo/BeamMP-Launcher/src/GameStart.cpp:13: /Users/enzofournet/GithubRepo/BeamMP-Launcher/include/vdf_parser.hpp:134:22: warning: 'wstring_convert<std::codecvt_utf8<wchar_t>>' is deprecated [-Wdeprecated-declarations] 134 | std::wstring_convert<std::codecvt_utf8<wchar_t>> conv1; | ^ /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX15.0.sdk/usr/include/c++/v1/locale:3114:28: note: 'wstring_convert<std::codecvt_utf8<wchar_t>>' has been explicitly marked deprecated here 3114 | class _LIBCPP_TEMPLATE_VIS _LIBCPP_DEPRECATED_IN_CXX17 wstring_convert { | ^ /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX15.0.sdk/usr/include/c++/v1/__config:1022:41: note: expanded from macro '_LIBCPP_DEPRECATED_IN_CXX17' 1022 | # define _LIBCPP_DEPRECATED_IN_CXX17 _LIBCPP_DEPRECATED | ^ /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX15.0.sdk/usr/include/c++/v1/__config:995:49: note: expanded from macro '_LIBCPP_DEPRECATED' 995 | # define _LIBCPP_DEPRECATED __attribute__((__deprecated__)) | ^ 2 warnings generated. [ 11%] Building CXX object CMakeFiles/Launcher.dir/src/Security/BeamNG.cpp.o In file included from /Users/enzofournet/GithubRepo/BeamMP-Launcher/src/Security/BeamNG.cpp:13: /Users/enzofournet/GithubRepo/BeamMP-Launcher/include/vdf_parser.hpp:134:43: warning: 'codecvt_utf8<wchar_t>' is deprecated [-Wdeprecated-declarations] 134 | std::wstring_convert<std::codecvt_utf8<wchar_t>> conv1; | ^ /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX15.0.sdk/usr/include/c++/v1/codecvt:194:28: note: 'codecvt_utf8<wchar_t>' has been explicitly marked deprecated here 194 | class _LIBCPP_TEMPLATE_VIS _LIBCPP_DEPRECATED_IN_CXX17 codecvt_utf8 : public __codecvt_utf8<_Elem> { | ^ /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX15.0.sdk/usr/include/c++/v1/__config:1022:41: note: expanded from macro '_LIBCPP_DEPRECATED_IN_CXX17' 1022 | # define _LIBCPP_DEPRECATED_IN_CXX17 _LIBCPP_DEPRECATED | ^ /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX15.0.sdk/usr/include/c++/v1/__config:995:49: note: expanded from macro '_LIBCPP_DEPRECATED' 995 | # define _LIBCPP_DEPRECATED __attribute__((__deprecated__)) | ^ In file included from /Users/enzofournet/GithubRepo/BeamMP-Launcher/src/Security/BeamNG.cpp:13: /Users/enzofournet/GithubRepo/BeamMP-Launcher/include/vdf_parser.hpp:134:22: warning: 'wstring_convert<std::codecvt_utf8<wchar_t>>' is deprecated [-Wdeprecated-declarations] 134 | std::wstring_convert<std::codecvt_utf8<wchar_t>> conv1; | ^ /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX15.0.sdk/usr/include/c++/v1/locale:3114:28: note: 'wstring_convert<std::codecvt_utf8<wchar_t>>' has been explicitly marked deprecated here 3114 | class _LIBCPP_TEMPLATE_VIS _LIBCPP_DEPRECATED_IN_CXX17 wstring_convert { | ^ /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX15.0.sdk/usr/include/c++/v1/__config:1022:41: note: expanded from macro '_LIBCPP_DEPRECATED_IN_CXX17' 1022 | # define _LIBCPP_DEPRECATED_IN_CXX17 _LIBCPP_DEPRECATED | ^ /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX15.0.sdk/usr/include/c++/v1/__config:995:49: note: expanded from macro '_LIBCPP_DEPRECATED' 995 | # define _LIBCPP_DEPRECATED __attribute__((__deprecated__)) | ^ 2 warnings generated. [ 17%] Linking CXX executable BeamMP-Launcher ld: warning: ignoring duplicate libraries: 'vcpkg_installed/arm64-osx/lib/libz.a' [100%] Built target Launcher Book • ➜ ~/GithubRepo/BeamMP-Launcher git:(ghcw-session-d22d) ✗ ```

enzofrnt · 2024-11-27T12:35:42Z

@WiserTixx finished

enzofrnt · 2024-11-27T14:07:12Z

@WiserTixx done !

src/Security/BeamNG.cpp

Co-authored-by: Tixx <83774803+WiserTixx@users.noreply.github.com>

enzofrnt · 2024-12-04T21:50:31Z

Any news ?

src/GameStart.cpp

src/Security/BeamNG.cpp

src/GameStart.cpp

and adding wine param

enzofrnt · 2025-02-11T11:10:16Z

I think that I have answered all your concerns.

WiserTixx · 2025-02-15T19:54:09Z

Hey, could you make this work with just wine? It has come to my attention that crossover is a paid product that uses wine under the hood. Also it seems like some code got messed up after you updated your branch, could you fix that?

Ethen-Blackett · 2025-02-16T21:51:42Z

Hey, could you make this work with just wine? It has come to my attention that crossover is a paid product that uses wine under the hood. Also it seems like some code got messed up after you updated your branch, could you fix that?

Compatibility with Whiskey would be much appreciated 🙌
https://github.com/Whisky-App/Whisky

enzofrnt · 2026-01-09T18:31:50Z

Clode in favor of #221.

enzofrnt added 30 commits November 7, 2024 19:46

Mac Build

2946cef

fix

ccde804

fixes

c6eab33

Update linuxfixes.h

f1f02b4

Update linuxfixes.h

d74da8f

Update Core.cpp

9de4fdc

Update Core.cpp

1c683c2

Go back

6012257

fix

584c02f

fix

7f1d147

fix with linux fix

0975ac8

Update Core.cpp

bec19a3

Update DNS.cpp

86d59a2

fixes

368d249

Update Resources.cpp

15ac42e

Update VehicleData.cpp

bf8d258

Update Options.h

c26d359

Update BeamNG.cpp

45dee97

fixes

cde7a42

Update GameStart.cpp

8039c44

force to arm64

94bb736

verify runnner arch

2bca006

force arm64

e674c16

force arm64

f28172e

force arm64

56f4e85

fixes

4ae2291

Merge branch 'ghcw-session-d22d' of https://github.com/enzofrnt/BeamM…

822b24b

…P-Launcher into ghcw-session-d22d

fix game path research on macos

a6779ed

working

fd3dcf7

enzofrnt added 5 commits November 27, 2024 13:13

Merge branch 'master' of https://github.com/enzofrnt/BeamMP-Launcher

102ae74

string to char

6b6d86c

Update BeamNG.cpp

84dd5f3

comment done

3a7dc06

Update BeamNG.cpp

95e9a6a

enzofrnt requested a review from WiserTixx November 27, 2024 12:35

Update BeamNG.cpp

6ebe19a

WiserTixx requested changes Dec 1, 2024

View reviewed changes

src/Security/BeamNG.cpp Outdated Show resolved Hide resolved

src/Security/BeamNG.cpp Outdated Show resolved Hide resolved

enzofrnt and others added 4 commits December 1, 2024 18:18

Update src/Security/BeamNG.cpp

40da2bb

Co-authored-by: Tixx <83774803+WiserTixx@users.noreply.github.com>

ToLower only on letter

6f5d927

Merge branch 'master' of https://github.com/enzofrnt/BeamMP-Launcher

cf7a193

fix

43eabf1

enzofrnt requested a review from WiserTixx December 4, 2024 21:50

lionkor suggested changes Dec 21, 2024

View reviewed changes

enzofrnt added 3 commits February 11, 2025 12:02

fixing recommendation

83fe727

and adding wine param

Merge remote-tracking branch 'upstream/master'

2b43791

fixing

d8278ff

enzofrnt requested a review from lionkor February 11, 2025 11:10

fixing linux and windows build

c927ded

WiserTixx added this to BeamMP - Development Mar 8, 2025

WiserTixx moved this to In progress in BeamMP - Development Mar 8, 2025

enzofrnt closed this Jan 9, 2026

github-project-automation bot moved this from In progress to Done in BeamMP - Development Jan 9, 2026

Conversation

enzofrnt commented Nov 8, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Build Configuration:

Source Code Modifications:

Header File Updates:

Additional Functionality:

Uh oh!

enzofrnt commented Nov 27, 2024

Uh oh!

enzofrnt commented Nov 27, 2024

Uh oh!

Uh oh!

Uh oh!

enzofrnt commented Dec 4, 2024

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

enzofrnt commented Feb 11, 2025

Uh oh!

WiserTixx commented Feb 15, 2025

Uh oh!

Ethen-Blackett commented Feb 16, 2025

Uh oh!

enzofrnt commented Jan 9, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

enzofrnt commented Nov 8, 2024 •

edited

Loading