Commit aa187178 authored by Libretro-Admin's avatar Libretro-Admin
Browse files

Add ARM64 Mac support

parent 028eb3df
Pipeline #10527 failed
......@@ -34,6 +34,11 @@ include:
- project: 'libretro-infrastructure/ci-templates'
file: '/osx-x64.yml'
# MacOS ARM 64-bit
- project: 'libretro-infrastructure/ci-templates'
ref: 'macosx-arm64'
file: '/osx-arm64.yml'
################################## CELLULAR ################################
# Android
- project: 'libretro-infrastructure/ci-templates'
......@@ -122,6 +127,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:
......
STATIC_LINKING=0
ifeq ($(platform),)
ifeq ($(shell uname -s),)
platform = win
else ifneq ($(findstring MINGW,$(shell uname -a)),)
platform = win
else ifneq ($(findstring Darwin,$(shell uname -a)),)
platform = osx
else ifneq ($(findstring win,$(shell uname -a)),)
platform = win
else
platform = unix
endif
endif
ifeq ($(platform),)
platform = unix
ifeq ($(shell uname -s),)
......@@ -24,10 +38,15 @@ ifeq ($(shell uname -a),)
system_platform = win
else ifneq ($(findstring Darwin,$(shell uname -a)),)
system_platform = osx
arch = intel
ifeq ($(shell uname -p),powerpc)
arch = ppc
ifeq ($(shell uname -p),powerpc)
arch = ppc
else
ifeq ($(shell uname -p),arm)
arch = arm
else
arch = intel
endif
endif
else ifneq ($(findstring MINGW,$(shell uname -a)),)
system_platform = win
endif
......@@ -80,7 +99,16 @@ else ifeq ($(platform), osx)
SHARED := -dynamiclib
OSXVER = `sw_vers -productVersion | cut -d. -f 2`
OSX_LT_MAVERICKS = `(( $(OSXVER) <= 9)) && echo "YES"`
fpic += -mmacosx-version-min=10.1
ifeq ($(arch),arm)
TARGET_RULE = -target $(LIBRETRO_APPLE_PLATFORM) -isysroot $(LIBRETRO_APPLE_ISYSROOT)
CFLAGS += $(TARGET_RULE)
CPPFLAGS += $(TARGET_RULE)
CXXFLAGS += $(TARGET_RULE)
else
fpic += -mmacosx-version-min=10.1
endif
CFLAGS += $(ARCHFLAGS)
LDFLAGS += $(ARCHFLAGS)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment