Merge pull request #17654 from warmenhoven/warmenhoven/pr/apple-build
apple: by default build on apple silicon builder
This commit is contained in:
commit
fe11b3ffb1
|
@ -331,7 +331,7 @@ build-retroarch-linux-i686:
|
||||||
.build-retroarch-macos-xcode:
|
.build-retroarch-macos-xcode:
|
||||||
# Metal/Universal x86_64 arm64 is default
|
# Metal/Universal x86_64 arm64 is default
|
||||||
tags:
|
tags:
|
||||||
- macosx-packaging
|
- mac-apple-silicon
|
||||||
stage: build
|
stage: build
|
||||||
variables:
|
variables:
|
||||||
XCARCHIVE_PATH: pkg/apple/build/RetroArchUniversal
|
XCARCHIVE_PATH: pkg/apple/build/RetroArchUniversal
|
||||||
|
@ -358,6 +358,8 @@ build-retroarch-osx-universal-metal:
|
||||||
|
|
||||||
build-retroarch-osx-opengl-x64:
|
build-retroarch-osx-opengl-x64:
|
||||||
extends: .build-retroarch-macos-xcode
|
extends: .build-retroarch-macos-xcode
|
||||||
|
tags:
|
||||||
|
- macosx-packaging
|
||||||
variables:
|
variables:
|
||||||
XCARCHIVE_PATH: pkg/apple/build/RetroArchOpenGL
|
XCARCHIVE_PATH: pkg/apple/build/RetroArchOpenGL
|
||||||
XCPROJECT_NAME: RetroArch
|
XCPROJECT_NAME: RetroArch
|
||||||
|
@ -388,8 +390,6 @@ build-retroarch-osx-opengl-x64:
|
||||||
|
|
||||||
build-retroarch-ios-arm64:
|
build-retroarch-ios-arm64:
|
||||||
extends: .build-retroarch-macos-xcode
|
extends: .build-retroarch-macos-xcode
|
||||||
tags:
|
|
||||||
- mac-apple-silicon
|
|
||||||
variables:
|
variables:
|
||||||
XCPROJECT_NAME: RetroArch_iOS13
|
XCPROJECT_NAME: RetroArch_iOS13
|
||||||
XCCONFIG: GitLabCI.xcconfig
|
XCCONFIG: GitLabCI.xcconfig
|
||||||
|
|
Loading…
Reference in New Issue