Skip to content

Commit de37e8c

Browse files
committed
ci: macOS: build intel binaries on arm64 too.
1 parent acdba11 commit de37e8c

File tree

5 files changed

+16
-34
lines changed

5 files changed

+16
-34
lines changed

.github/workflows/build.mac.workflow.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ on:
88

99
jobs:
1010
build:
11-
name: "Build: ${{ matrix.os }} ${{ matrix.archname }}"
12-
runs-on: ${{ matrix.os }}
11+
name: "Build: ${{ matrix.archname }}"
12+
runs-on: macos-14
1313
strategy:
1414
fail-fast: false
1515
matrix:
@@ -18,10 +18,8 @@ jobs:
1818
include:
1919
- archname: "intel"
2020
arch: x64
21-
os: macos-13
2221
- archname: "arm"
2322
arch: arm64
24-
os: macos-14
2523

2624
steps:
2725
- name: Checkout Git Repo
@@ -36,7 +34,7 @@ jobs:
3634
- name: Install dependencies
3735
run: |
3836
set -e
39-
brew install automake autoconf libtool libusb
37+
brew install automake autoconf autoconf-archive libtool
4038
4139
- name: Install latest CMake
4240
uses: lukka/get-cmake@628dd514bed37cb0a609e84a6186cbbaa2fc0140 # latest as of 2025-10-04
@@ -54,7 +52,7 @@ jobs:
5452
configurePresetAdditionalArgs: "['-DDEPS_RELEASE_ONLY=ON', '-DSHORT_VERSION=v3.0']"
5553
buildPreset: 'Mac-${{ matrix.arch }}-${{ matrix.config }}'
5654
env:
57-
VCPKG_DEFAULT_HOST_TRIPLET: ${{ matrix.arch }}-osx-release
55+
VCPKG_DEFAULT_HOST_TRIPLET: arm64-osx-release
5856
VCPKG_FORCE_SYSTEM_BINARIES: 1
5957

6058
- name: Move to temp folder

gui/qt/CMakeLists.txt

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,19 @@ if(DEPS_RELEASE_ONLY)
1717
endif()
1818
endif()
1919

20+
if(APPLE)
21+
set(MAYBE_MACOSX_BUNDLE MACOSX_BUNDLE)
22+
if(VCPKG_TARGET_TRIPLET MATCHES "^x64")
23+
set(CMAKE_OSX_ARCHITECTURES "x86_64")
24+
set(VCPKG_TARGET_ARCHITECTURE "x64")
25+
else()
26+
set(CMAKE_OSX_ARCHITECTURES "arm64")
27+
set(VCPKG_TARGET_ARCHITECTURE "arm64")
28+
endif()
29+
endif()
30+
2031
project(CEmu
21-
VERSION 2.0
32+
VERSION 3.0
2233
LANGUAGES C CXX)
2334

2435
if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../../core/debug/zdis/zdis.c" OR
@@ -71,10 +82,6 @@ if(COMMAND qt_standard_project_setup)
7182
qt_standard_project_setup()
7283
endif()
7384

74-
if(APPLE)
75-
set(MAYBE_MACOSX_BUNDLE MACOSX_BUNDLE)
76-
endif()
77-
7885
qt_add_resources(CEmu_Resources resources.qrc)
7986

8087
set(CEmu_Sources

gui/qt/triplets/x64-osx-minver-release.cmake

Lines changed: 0 additions & 10 deletions
This file was deleted.

gui/qt/triplets/x64-osx-minver.cmake

Lines changed: 0 additions & 9 deletions
This file was deleted.

gui/qt/triplets/x86-windows-static-release.cmake

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)