Skip to content

Universal macOS build (arm64 and x86_64) and update min supported macOS to 10.13 #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bridgecommand merged 6 commits into from
Jan 18, 2026
Merged

Universal macOS build (arm64 and x86_64) and update min supported macOS to 10.13 #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dd80760
Updates to compile on newer macOS. Minimum deployment target changed …
bridgecommand Jan 14, 2026
fabed88
Update main CMakeLists.txt to target macOS 10.13
bridgecommand Jan 15, 2026
49e1ca3
Moving nested macOS app bundles into Helpers folder
bridgecommand Jan 17, 2026
ae8b65d
Hard code out window resizing on macOS, was causing crash at startup,…
bridgecommand Jan 17, 2026
5a95a28
Update supported version in Info.plist files
bridgecommand Jan 17, 2026
a055df2
Compile for macOS for both ARM and Intel
bridgecommand Jan 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...Contents/MacOS/bc.app/Contents/Info.plist → ...ntents/Helpers/bc.app/Contents/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<key>CFBundleIdentifier</key>
<string>uk.co.bridgecommand.bc</string>
<key>LSMinimumSystemVersion</key>
<string>10.7.0</string>
<string>10.13.0</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.simulation-games</string>
<key>CFBundleName</key>
Expand Down
0 ...ts/MacOS/bc.app/Contents/MacOS/.gitignore → .../Helpers/bc.app/Contents/MacOS/.gitignore
View file
Open in desktop
File renamed without changes.
0 ...pp/Contents/MacOS/bc.app/Contents/PkgInfo → .../Contents/Helpers/bc.app/Contents/PkgInfo
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...Contents/MacOS/ed.app/Contents/Info.plist → ...ntents/Helpers/ed.app/Contents/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<key>CFBundleIdentifier</key>
<string>uk.co.bridgecommand.ed</string>
<key>LSMinimumSystemVersion</key>
<string>10.7.0</string>
<string>10.13.0</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.simulation-games</string>
<key>CFBundleName</key>
Expand Down
0 ...ts/MacOS/ed.app/Contents/MacOS/.gitignore → .../Helpers/ed.app/Contents/MacOS/.gitignore
View file
Open in desktop
File renamed without changes.
0 ...pp/Contents/MacOS/ed.app/Contents/PkgInfo → .../Contents/Helpers/ed.app/Contents/PkgInfo
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ontents/MacOS/ini.app/Contents/Info.plist → ...tents/Helpers/ini.app/Contents/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<key>CFBundleIdentifier</key>
<string>uk.co.bridgecommand.ini</string>
<key>LSMinimumSystemVersion</key>
<string>10.7.0</string>
<string>10.13.0</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.simulation-games</string>
<key>CFBundleName</key>
Expand Down
0 ...s/MacOS/ini.app/Contents/MacOS/.gitignore → ...Helpers/ini.app/Contents/MacOS/.gitignore
View file
Open in desktop
File renamed without changes.
0 ...p/Contents/MacOS/ini.app/Contents/PkgInfo → ...Contents/Helpers/ini.app/Contents/PkgInfo
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...Contents/MacOS/mc.app/Contents/Info.plist → ...ntents/Helpers/mc.app/Contents/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<key>CFBundleIdentifier</key>
<string>uk.co.bridgecommand.mc</string>
<key>LSMinimumSystemVersion</key>
<string>10.7.0</string>
<string>10.13.0</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.simulation-games</string>
<key>CFBundleName</key>
Expand Down
0 ...ts/MacOS/mc.app/Contents/MacOS/.gitignore → .../Helpers/mc.app/Contents/MacOS/.gitignore
View file
Open in desktop
File renamed without changes.
0 ...pp/Contents/MacOS/mc.app/Contents/PkgInfo → .../Contents/Helpers/mc.app/Contents/PkgInfo
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...Contents/MacOS/mh.app/Contents/Info.plist → ...ntents/Helpers/mh.app/Contents/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<key>CFBundleIdentifier</key>
<string>uk.co.bridgecommand.mh</string>
<key>LSMinimumSystemVersion</key>
<string>10.7.0</string>
<string>10.13.0</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.simulation-games</string>
<key>CFBundleName</key>
Expand Down
0 ...ts/MacOS/mh.app/Contents/MacOS/.gitignore → .../Helpers/mh.app/Contents/MacOS/.gitignore
View file
Open in desktop
File renamed without changes.
0 ...pp/Contents/MacOS/mh.app/Contents/PkgInfo → .../Contents/Helpers/mh.app/Contents/PkgInfo
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...Contents/MacOS/rp.app/Contents/Info.plist → ...ntents/Helpers/rp.app/Contents/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<key>CFBundleIdentifier</key>
<string>uk.co.bridgecommand.rp</string>
<key>LSMinimumSystemVersion</key>
<string>10.7.0</string>
<string>10.13.0</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.simulation-games</string>
<key>CFBundleName</key>
Expand Down
0 ...ts/MacOS/rp.app/Contents/MacOS/.gitignore → .../Helpers/rp.app/Contents/MacOS/.gitignore
View file
Open in desktop
File renamed without changes.
0 ...pp/Contents/MacOS/rp.app/Contents/PkgInfo → .../Contents/Helpers/rp.app/Contents/PkgInfo
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion bin/BridgeCommand.app/Contents/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<key>CFBundleIdentifier</key>
<string>uk.co.bridgecommand.BridgeCommand</string>
<key>LSMinimumSystemVersion</key>
<string>10.7.0</string>
<string>10.13.0</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.simulation-games</string>
<key>CFBundleName</key>
Expand Down
24 changes: 12 additions & 12 deletions bin/macOScopy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
#!/bin/sh

cp bridgecommand BridgeCommand.app/Contents/MacOS/BridgeCommand
cp bridgecommand-bc BridgeCommand.app/Contents/MacOS/bc.app/Contents/MacOS/bc
cp bridgecommand-mc BridgeCommand.app/Contents/MacOS/mc.app/Contents/MacOS/mc
cp bridgecommand-ed BridgeCommand.app/Contents/MacOS/ed.app/Contents/MacOS/ed
cp bridgecommand-ini BridgeCommand.app/Contents/MacOS/ini.app/Contents/MacOS/ini
cp bridgecommand-mh BridgeCommand.app/Contents/MacOS/mh.app/Contents/MacOS/mh
cp bridgecommand-rp BridgeCommand.app/Contents/MacOS/rp.app/Contents/MacOS/rp
cp bridgecommand-bc BridgeCommand.app/Contents/Helpers/bc.app/Contents/MacOS/bc
cp bridgecommand-mc BridgeCommand.app/Contents/Helpers/mc.app/Contents/MacOS/mc
cp bridgecommand-ed BridgeCommand.app/Contents/Helpers/ed.app/Contents/MacOS/ed
cp bridgecommand-ini BridgeCommand.app/Contents/Helpers/ini.app/Contents/MacOS/ini
cp bridgecommand-mh BridgeCommand.app/Contents/Helpers/mh.app/Contents/MacOS/mh
cp bridgecommand-rp BridgeCommand.app/Contents/Helpers/rp.app/Contents/MacOS/rp

rm -f BridgeCommand.app/Contents/MacOS/bc.app/Contents/MacOS/.gitignore
rm -f BridgeCommand.app/Contents/MacOS/mc.app/Contents/MacOS/.gitignore
rm -f BridgeCommand.app/Contents/MacOS/ed.app/Contents/MacOS/.gitignore
rm -f BridgeCommand.app/Contents/MacOS/ini.app/Contents/MacOS/.gitignore
rm -f BridgeCommand.app/Contents/MacOS/mh.app/Contents/MacOS/.gitignore
rm -f BridgeCommand.app/Contents/MacOS/rp.app/Contents/MacOS/.gitignore
rm -f BridgeCommand.app/Helpers/MacOS/bc.app/Contents/MacOS/.gitignore
rm -f BridgeCommand.app/Helpers/MacOS/mc.app/Contents/MacOS/.gitignore
rm -f BridgeCommand.app/Helpers/MacOS/ed.app/Contents/MacOS/.gitignore
rm -f BridgeCommand.app/Helpers/MacOS/ini.app/Contents/MacOS/.gitignore
rm -f BridgeCommand.app/Helpers/MacOS/mh.app/Contents/MacOS/.gitignore
rm -f BridgeCommand.app/Helpers/MacOS/rp.app/Contents/MacOS/.gitignore
rm -f BridgeCommand.app/Contents/MacOS/.gitignore
rm -rf BridgeCommand.app/Contents/Resources/doc
rm -rf BridgeCommand.app/Contents/Resources/media
Expand Down
5 changes: 3 additions & 2 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})

if (APPLE)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.7")
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.7")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.13")
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.13")
set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64")
endif (APPLE)

add_subdirectory(libs/asio)
Expand Down
18 changes: 9 additions & 9 deletions src/launcher/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ class Receiver : public irr::IEventReceiver
#else
#ifdef __APPLE__
//APPLE
execl("../MacOS/bc.app/Contents/MacOS/bc", "bc", NULL);
execl("../Helpers/bc.app/Contents/MacOS/bc", "bc", NULL);
#else
//Other (assumed posix)
execl("./bridgecommand-bc", "bridgecommand-bc", NULL);
Expand All @@ -101,7 +101,7 @@ class Receiver : public irr::IEventReceiver
#else
#ifdef __APPLE__
//APPLE
execl("../MacOS/mc.app/Contents/MacOS/mc", "mc", NULL);
execl("../Helpers/mc.app/Contents/MacOS/mc", "mc", NULL);
#else
//Other (assumed posix)
execl("./bridgecommand-mc", "bridgecommand-mc", NULL);
Expand All @@ -115,7 +115,7 @@ class Receiver : public irr::IEventReceiver
#else
#ifdef __APPLE__
//APPLE
execl("../MacOS/rp.app/Contents/MacOS/rp", "rp", NULL);
execl("../Helpers/rp.app/Contents/MacOS/rp", "rp", NULL);
#else
//Other (assumed posix)
execl("./bridgecommand-rp", "bridgecommand-rp", NULL);
Expand All @@ -129,7 +129,7 @@ class Receiver : public irr::IEventReceiver
#else
#ifdef __APPLE__
//APPLE
execl("../MacOS/ed.app/Contents/MacOS/ed", "ed", NULL);
execl("../Helpers/ed.app/Contents/MacOS/ed", "ed", NULL);
#else
//Other (assumed posix)
execl("./bridgecommand-ed", "bridgecommand-ed", NULL);
Expand All @@ -143,7 +143,7 @@ class Receiver : public irr::IEventReceiver
#else
#ifdef __APPLE__
//APPLE
execl("../MacOS/mh.app/Contents/MacOS/mh", "mh", NULL);
execl("../Helpers/mh.app/Contents/MacOS/mh", "mh", NULL);
#else
//Other (assumed posix)
execl("./bridgecommand-mh", "bridgecommand-mh", NULL);
Expand All @@ -157,7 +157,7 @@ class Receiver : public irr::IEventReceiver
#else
#ifdef __APPLE__
//APPLE
execl("../MacOS/ini.app/Contents/MacOS/ini", "ini", NULL);
execl("../Helpers/ini.app/Contents/MacOS/ini", "ini", NULL);
#else
//Other (assumed posix)
execl("./bridgecommand-ini", "bridgecommand-ini", NULL);
Expand All @@ -171,7 +171,7 @@ class Receiver : public irr::IEventReceiver
#else
#ifdef __APPLE__
//APPLE
execl("../MacOS/ini.app/Contents/MacOS/ini", "ini", "-M", NULL);
execl("../Helpers/ini.app/Contents/MacOS/ini", "ini", "-M", NULL);
#else
//Other (assumed posix)
execl("./bridgecommand-ini", "bridgecommand-ini", "-M", NULL);
Expand All @@ -185,7 +185,7 @@ class Receiver : public irr::IEventReceiver
#else
#ifdef __APPLE__
//APPLE
execl("../MacOS/ini.app/Contents/MacOS/ini", "ini", "-R", NULL);
execl("../Helpers/ini.app/Contents/MacOS/ini", "ini", "-R", NULL);
#else
//Other (assumed posix)
execl("./bridgecommand-ini", "bridgecommand-ini", "-R", NULL);
Expand All @@ -199,7 +199,7 @@ class Receiver : public irr::IEventReceiver
#else
#ifdef __APPLE__
//APPLE
execl("../MacOS/ini.app/Contents/MacOS/ini", "ini", "-H", NULL);
execl("../Helpers/ini.app/Contents/MacOS/ini", "ini", "-H", NULL);
#else
//Other (assumed posix)
execl("./bridgecommand-ini", "bridgecommand-ini", "-H", NULL);
Expand Down
10 changes: 10 additions & 0 deletions src/libs/Irrlicht/changesForBC.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,16 @@ CIrrDeviceOSX.mm:
-:ievent.MouseInput.Control = ([(NSEvent *)event modifierFlags] & NSControlKeyMask) != 0;
+:ievent.MouseInput.Control = ([(NSEvent *)event modifierFlags] & NSCommandKeyMask) != 0; //JAMES

At windowWillResize, comment out lines:
- if (Device->isResizable())
- return proposedFrameSize;
- else
+ // JAMES: Force not to be resizeable. This seemed to be causing a crash at startup (race condition?)
+ //if (Device->isResizable())
+ // return proposedFrameSize;
+ //else


CIrrDeviceWin32.cpp:
Below activeJoystick.axisValid[5]= (info.lRz!=0) ? 1 : 0;
+:activeJoystick.axisValid[6] = (info.rglSlider[0] != 0) ? 1 : 0; //JAMES
Expand Down
7 changes: 4 additions & 3 deletions src/libs/Irrlicht/irrlicht-svn/source/Irrlicht/CIrrDeviceOSX.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,9 +531,10 @@ - (void)windowWillClose:(id)sender

- (NSSize)windowWillResize:(NSWindow *)window toSize:(NSSize)proposedFrameSize
{
if (Device->isResizable())
return proposedFrameSize;
else
// JAMES: Force not to be resizeable. This seemed to be causing a crash at startup (race condition?)
//if (Device->isResizable())
// return proposedFrameSize;
//else
return [window frame].size;
}

Expand Down
8 changes: 4 additions & 4 deletions src/libs/Irrlicht/irrlicht-svn/source/Irrlicht/Irrlicht.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2493,7 +2493,7 @@
"PNG_ARM_NEON_OPT=0",
);
INSTALL_PATH = /;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.13;
ONLY_ACTIVE_ARCH = YES;
OTHER_CPLUSPLUSFLAGS = (
"$(OTHER_CFLAGS)",
Expand All @@ -2513,7 +2513,7 @@
"PNG_ARM_NEON_OPT=0",
);
INSTALL_PATH = /;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.13;
OTHER_CPLUSPLUSFLAGS = (
"$(OTHER_CFLAGS)",
"-U__STRICT_ANSI__",
Expand Down Expand Up @@ -2548,7 +2548,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.13;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
PRODUCT_NAME = Irrlicht;
Expand Down Expand Up @@ -2582,7 +2582,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.13;
MTL_ENABLE_DEBUG_INFO = NO;
PRODUCT_NAME = Irrlicht;
SDKROOT = macosx;
Expand Down
2 changes: 1 addition & 1 deletion src/libs/Irrlicht/irrlicht-svn/source/Irrlicht/libpng/pngpriv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,7 @@
* <fp.h> if possible.
*/
# if !defined(__MATH_H__) && !defined(__MATH_H) && !defined(__cmath__)
# include <fp.h>
# include <math.h>
# endif
# else
# include <math.h>
Expand Down
2 changes: 1 addition & 1 deletion src/libs/enet-1.3.14/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.6)
cmake_minimum_required(VERSION 3.5)

project(enet)

Expand Down