Skip to content

Build macOS universal binary (x86_64 + arm64) #178

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
emoon merged 2 commits into from
Nov 30, 2025
Merged

Build macOS universal binary (x86_64 + arm64) #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec4f766
Build macOS universal binary (x86_64 + arm64)
emoon Nov 30, 2025
fe8736e
Fix strict-prototypes warning in minimp3.h for macOS
emoon Nov 30, 2025
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
13 changes: 9 additions & 4 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,26 @@ jobs:
submodules: true

- name: Configure
run: cmake -B build -S . -DCMAKE_BUILD_TYPE=Release
run: cmake -B build -S . -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"

- name: Build
run: cmake --build build --parallel

- name: Verify universal binary
run: |
file build/RocketEditor.app/Contents/MacOS/RocketEditor
lipo -info build/RocketEditor.app/Contents/MacOS/RocketEditor

- name: Package
run: |
cd build
zip -r RocketEditor-macOS.zip RocketEditor.app
zip -r RocketEditor-macOS-universal.zip RocketEditor.app

- name: Upload artifact
uses: actions/upload-artifact@v4
with:
name: RocketEditor-macOS
path: build/RocketEditor-macOS.zip
path: build/RocketEditor-macOS-universal.zip

build_windows:
runs-on: windows-latest
Expand Down Expand Up @@ -78,5 +83,5 @@ jobs:
uses: softprops/action-gh-release@v1
with:
files: |
RocketEditor-macOS.zip
RocketEditor-macOS-universal.zip
RocketEditor-Windows.zip
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ project(RocketEditor)

cmake_minimum_required(VERSION 3.5...3.28)

set(CMAKE_OSX_ARCHITECTURES x86_64)
set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64")

set(RKT_EXE_NAME "RocketEditor")
set(EXAMPLE_NAME "BasicExample")
Expand Down
2 changes: 1 addition & 1 deletion external/minimp3/minimp3.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ static int have_simd(void)
#define VMUL_S(x, s) vmulq_f32(x, vmovq_n_f32(s))
#define VREV(x) vcombine_f32(vget_high_f32(vrev64q_f32(x)), vget_low_f32(vrev64q_f32(x)))
typedef float32x4_t f4;
static int have_simd()
static int have_simd(void)
{ /* TODO: detect neon for !MINIMP3_ONLY_SIMD */
return 1;
}
Expand Down