Lightemerald/windows-user-space-emulator
2
0
Fork 0
mirror of https://github.com/momo5502/emulator.git synced 2026-01-11 08:36:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't build universal binaries on macOS

Browse Source
This commit is contained in:
momo5502
2025-01-23 18:24:31 +01:00
parent ff51fbcb24
commit 6b43e53a6f
3 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
.github/workflows/build.yml vendored
View File

@@ -80,7 +80,8 @@ jobs:
- Windows - Windows
- Linux GCC - Linux GCC
- Linux Clang - Linux Clang
- macOS - macOS arm64
- macOS x86_64
- Android x86_64 - Android x86_64
- Android arm64-v8a - Android arm64-v8a
configuration: configuration:
@@ -98,8 +99,10 @@ jobs:
- platform: Linux Clang - platform: Linux Clang
runner: ubuntu-24.04 runner: ubuntu-24.04
clang-version: 18 clang-version: 18
- platform: macOS - platform: macOS arm64
runner: macos-latest runner: macos-latest
- platform: macOS x86_64
runner: macos-13
- platform: Android x86_64 - platform: Android x86_64
runner: ubuntu-24.04 runner: ubuntu-24.04
abi: x86_64 abi: x86_64
@@ -191,36 +194,31 @@ jobs:
- configuration: Release - configuration: Release
preset: release preset: release
- platform: Windows - platform: Windows
build-platform: Windows
runner: windows-latest runner: windows-latest
- platform: Linux GCC - platform: Linux GCC
build-platform: Linux GCC
runner: ubuntu-24.04 runner: ubuntu-24.04
- platform: Linux Clang - platform: Linux Clang
build-platform: Linux Clang
runner: ubuntu-24.04 runner: ubuntu-24.04
- platform: macOS arm64 - platform: macOS arm64
build-platform: macOS
runner: macos-latest runner: macos-latest
- platform: macOS x86_64 - platform: macOS x86_64
build-platform: macOS
runner: macos-13 runner: macos-13
steps: steps:
- name: Download Test Config - name: Download Test Config
uses: pyTooling/download-artifact@v4 uses: pyTooling/download-artifact@v4
with: with:
name: Temp ${{ matrix.build-platform }} ${{matrix.configuration}} Test Config name: Temp ${{ matrix.platform }} ${{matrix.configuration}} Test Config
path: build/${{matrix.preset}} path: build/${{matrix.preset}}
- name: Download Artifacts - name: Download Artifacts
uses: pyTooling/download-artifact@v4 uses: pyTooling/download-artifact@v4
with: with:
name: ${{ matrix.build-platform }} ${{matrix.configuration}} Artifacts name: ${{ matrix.platform }} ${{matrix.configuration}} Artifacts
path: build/${{matrix.preset}}/artifacts path: build/${{matrix.preset}}/artifacts
- name: Download Windows Artifacts - name: Download Windows Artifacts
uses: pyTooling/download-artifact@v4 uses: pyTooling/download-artifact@v4
if: "${{ matrix.build-platform != 'Windows' }}" if: "${{ matrix.platform != 'Windows' }}"
with: with:
name: Windows ${{matrix.configuration}} Artifacts name: Windows ${{matrix.configuration}} Artifacts
path: build/${{matrix.preset}}/artifacts path: build/${{matrix.preset}}/artifacts

6
CMakeLists.txt
View File

@@ -24,7 +24,11 @@ set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_OSX_DEPLOYMENT_TARGET 11.0) set(CMAKE_OSX_DEPLOYMENT_TARGET 11.0)
set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64")
# Prevent unicorn from generating universal binaries on macOS
# It doesn't support it, even if it thinks it does...
set(ENV{ARCHFLAGS} "nope")
########################################## ##########################################

1
cmake/compiler-env.cmake
View File

@@ -22,7 +22,6 @@ set(CMAKE_POLICY_DEFAULT_CMP0069 NEW)
set(CMAKE_POSITION_INDEPENDENT_CODE ON) set(CMAKE_POSITION_INDEPENDENT_CODE ON)
set(CMAKE_INTERPROCEDURAL_OPTIMIZATION ON) set(CMAKE_INTERPROCEDURAL_OPTIMIZATION ON)
set(CMAKE_OSX_DEPLOYMENT_TARGET "11.0")
########################################## ##########################################