Skip to content

Commit

Permalink
Merge pull request #12 from warmenhoven/warmenhoven/pr/osx
Browse files Browse the repository at this point in the history
osx: No need to explicitly build with Xcode generator
  • Loading branch information
LibretroAdmin authored Oct 10, 2024
2 parents 50c1e48 + ede9a78 commit 2273b48
Showing 1 changed file with 3 additions and 9 deletions.
12 changes: 3 additions & 9 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,6 @@
variables:
CORE_ARGS: -DCMAKE_POSITION_INDEPENDENT_CODE=TRUE -DCMAKE_BUILD_TYPE=Release

.core-defs-osx:
extends: .core-defs
variables:
CORE_ARGS: -G Xcode -DCMAKE_BUILD_TYPE=Release
EXTRA_PATH: Release

# Inclusion templates, required for the build to work
include:
################################## DESKTOPS ################################
Expand Down Expand Up @@ -140,19 +134,19 @@ libretro-build-linux-i686:
libretro-build-osx-x86:
extends:
- .libretro-osx-cmake-x86
- .core-defs-osx
- .core-defs

# MacOS 64-bit
libretro-build-osx-x64:
extends:
- .libretro-osx-cmake-x86_64
- .core-defs-osx
- .core-defs

# MacOS ARM64
libretro-build-osx-arm64:
extends:
- .libretro-osx-cmake-arm64
- .core-defs-osx
- .core-defs

# DJGPP
libretro-build-djgpp-i586:
Expand Down

0 comments on commit 2273b48

Please sign in to comment.