Add Apple ARM64 rules
This commit is contained in:
@@ -34,6 +34,11 @@ include:
|
|||||||
- project: 'libretro-infrastructure/ci-templates'
|
- project: 'libretro-infrastructure/ci-templates'
|
||||||
file: '/osx-x64.yml'
|
file: '/osx-x64.yml'
|
||||||
|
|
||||||
|
# MacOS ARM 64-bit
|
||||||
|
- project: 'libretro-infrastructure/ci-templates'
|
||||||
|
ref: 'macosx-arm64'
|
||||||
|
file: '/osx-arm64.yml'
|
||||||
|
|
||||||
################################## CELLULAR ################################
|
################################## CELLULAR ################################
|
||||||
# Android
|
# Android
|
||||||
- project: 'libretro-infrastructure/ci-templates'
|
- project: 'libretro-infrastructure/ci-templates'
|
||||||
@@ -126,6 +131,12 @@ libretro-build-osx-x64:
|
|||||||
- .libretro-osx-x64-make-default
|
- .libretro-osx-x64-make-default
|
||||||
- .core-defs
|
- .core-defs
|
||||||
|
|
||||||
|
# MacOS ARM 64-bit
|
||||||
|
libretro-build-osx-arm64:
|
||||||
|
extends:
|
||||||
|
- .libretro-osx-arm64-make-default
|
||||||
|
- .core-defs
|
||||||
|
|
||||||
################################### CELLULAR #################################
|
################################### CELLULAR #################################
|
||||||
# Android ARMv7a
|
# Android ARMv7a
|
||||||
android-armeabi-v7a:
|
android-armeabi-v7a:
|
||||||
|
|||||||
@@ -41,10 +41,15 @@ ifeq ($(shell uname -a),)
|
|||||||
system_platform = win
|
system_platform = win
|
||||||
else ifneq ($(findstring Darwin,$(shell uname -a)),)
|
else ifneq ($(findstring Darwin,$(shell uname -a)),)
|
||||||
system_platform = osx
|
system_platform = osx
|
||||||
arch = intel
|
ifeq ($(shell uname -p),powerpc)
|
||||||
ifeq ($(shell uname -p),powerpc)
|
arch = ppc
|
||||||
arch = ppc
|
else
|
||||||
|
ifeq ($(shell uname -p),arm)
|
||||||
|
arch = arm
|
||||||
|
else
|
||||||
|
arch = intel
|
||||||
endif
|
endif
|
||||||
|
endif
|
||||||
else ifneq ($(findstring MINGW,$(shell uname -a)),)
|
else ifneq ($(findstring MINGW,$(shell uname -a)),)
|
||||||
system_platform = win
|
system_platform = win
|
||||||
endif
|
endif
|
||||||
@@ -86,9 +91,11 @@ else ifeq ($(platform), osx)
|
|||||||
ifeq ($(arch),ppc)
|
ifeq ($(arch),ppc)
|
||||||
ENDIANNESS_DEFINES += -DMSB_FIRST -DHAVE_NO_LANGEXTRA
|
ENDIANNESS_DEFINES += -DMSB_FIRST -DHAVE_NO_LANGEXTRA
|
||||||
endif
|
endif
|
||||||
|
ifneq ($(arch),arm)
|
||||||
|
fpic += -mmacosx-version-min=10.1
|
||||||
|
endif
|
||||||
OSXVER = `sw_vers -productVersion | cut -d. -f 2`
|
OSXVER = `sw_vers -productVersion | cut -d. -f 2`
|
||||||
OSX_LT_MAVERICKS = `(( $(OSXVER) <= 9)) && echo "YES"`
|
OSX_LT_MAVERICKS = `(( $(OSXVER) <= 9)) && echo "YES"`
|
||||||
fpic += -mmacosx-version-min=10.1
|
|
||||||
ifndef ($(NOUNIVERSAL))
|
ifndef ($(NOUNIVERSAL))
|
||||||
CFLAGS += $(ARCHFLAGS)
|
CFLAGS += $(ARCHFLAGS)
|
||||||
LDFLAGS += $(ARCHFLAGS)
|
LDFLAGS += $(ARCHFLAGS)
|
||||||
|
|||||||
Reference in New Issue
Block a user