diff options
| author | twinaphex | 2021-01-29 09:03:33 +0100 |
|---|---|---|
| committer | twinaphex | 2021-01-29 09:03:33 +0100 |
| commit | ff6a6e6e6482ac1a773b192f87916688ebd86abd (patch) | |
| tree | 2b4cba6d38c43a6a351823b3c726d1dd2676c57d | |
| parent | 0cdf9acc5cb073a0d0b1a1bdc0e86aa56b3f69a9 (diff) | |
| download | snes9x2002-ff6a6e6e6482ac1a773b192f87916688ebd86abd.tar.gz snes9x2002-ff6a6e6e6482ac1a773b192f87916688ebd86abd.tar.bz2 snes9x2002-ff6a6e6e6482ac1a773b192f87916688ebd86abd.zip | |
(MacOS) Add ARM 64bit support
| -rw-r--r-- | .gitlab-ci.yml | 10 | ||||
| -rw-r--r-- | Makefile | 9 |
2 files changed, 19 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dc41b5d..4a26418 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,6 +33,10 @@ include: - project: 'libretro-infrastructure/ci-templates' file: '/osx-x64.yml' + # MacOS ARM 64-bit + - project: 'libretro-infrastructure/ci-templates' + file: '/osx-arm64.yml' + ################################## CELLULAR ################################ # Android - project: 'libretro-infrastructure/ci-templates' @@ -109,6 +113,12 @@ libretro-build-osx-x64: - .libretro-osx-x64-make-default - .core-defs +# MacOS ARM 64-bit +libretro-build-osx-arm64: + extends: + - .libretro-osx-arm64-make-default + - .core-defs + ################################### CELLULAR ################################# # Android ARMv7a android-armeabi-v7a: @@ -34,6 +34,15 @@ else ifeq ($(platform), osx) TARGET := $(TARGET_NAME)_libretro.dylib fpic := -fPIC SHARED := -dynamiclib + + ifeq ($(CROSS_COMPILE),1) + TARGET_RULE = -target $(LIBRETRO_APPLE_PLATFORM) -isysroot $(LIBRETRO_APPLE_ISYSROOT) + CFLAGS += $(TARGET_RULE) + CPPFLAGS += $(TARGET_RULE) + CXXFLAGS += $(TARGET_RULE) + LDFLAGS += $(TARGET_RULE) + endif + else ifneq (,$(findstring ios,$(platform))) TARGET := $(TARGET_NAME)_libretro_ios.dylib fpic := -fPIC |