libretro/beetle-pce-fast-libretro
1
0
Fork 0
mirror of https://github.com/libretro/beetle-pce-fast-libretro.git synced 2024-11-23 07:50:03 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

(MacOS) Set up CROSS_COMPILING for ARM 64bit

Browse Source
This commit is contained in:
twinaphex 2021-01-28 20:40:53 +01:00
parent aaaa9c725e
commit 60d4f2814c
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.gitlab-ci.yml
View File

@ -33,6 +33,10 @@ 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'
file: '/osx-arm64.yml'
################################## CELLULAR ################################ ################################## CELLULAR ################################
# Android # Android
- project: 'libretro-infrastructure/ci-templates' - project: 'libretro-infrastructure/ci-templates'
@ -121,6 +125,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:

15
Makefile
View File

@ -20,6 +20,9 @@ ifeq ($(platform),)
else ifneq ($(findstring Darwin,$(shell uname -s)),) else ifneq ($(findstring Darwin,$(shell uname -s)),)
platform = osx platform = osx
arch = intel arch = intel
ifeq ($(shell uname -p),arm64)
arch = arm
endif
ifeq ($(shell uname -p),powerpc) ifeq ($(shell uname -p),powerpc)
arch = ppc arch = ppc
endif endif
@ -158,11 +161,21 @@ else ifeq ($(platform), osx)
endif 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.7 MINVERSION += -mmacosx-version-min=10.7
ifeq ($(OSX_LT_MAVERICKS),"YES") ifeq ($(OSX_LT_MAVERICKS),"YES")
else else
fpic += -stdlib=libc++ fpic += -stdlib=libc++
endif endif
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)
MINVERSION =
endif
fpic += $(MINVERSION)
# iOS # iOS
else ifneq (,$(findstring ios,$(platform))) else ifneq (,$(findstring ios,$(platform)))