mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 22:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Gitlab) Try to build explicitly for ARM64 by passing -arch arm64

Browse Source
This commit is contained in:
twinaphex 2021-02-16 21:28:38 +01:00
parent 4b0f344024
commit e26f7ec8f6
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -464,7 +464,7 @@ build-retroarch-metal-osx-arm64:
script:
# Normal RetroArch Metal (ARM64) Build
- ./configure --enable-metal --disable-al
- make -j$NUMPROC
- make ARCH=arm64 -j$NUMPROC
# Cleanup for DMG creation
- rm -rvf "RetroArch_ARM64.app/"

26
Makefile.common
View File

@ -130,20 +130,30 @@ endif
ifneq ($(findstring Darwin,$(OS)),)
OSX := 1
LIBS += -framework AppKit
MINVERSION=
DARWINFLAGS=
ifeq ($(shell uname -p),arm)
MINVERSION = -mmacosx-version-min=10.15 -stdlib=libc++ # macOS (Metal, ARM 64bit)
DARWINFLAGS = -mmacosx-version-min=10.15 -stdlib=libc++ # macOS (Metal, ARM 64bit)
else ifeq ($(HAVE_METAL),1)
MINVERSION = -mmacosx-version-min=10.13 -stdlib=libc++ # macOS (Metal, x86 64bit)
DARWINFLAGS = -mmacosx-version-min=10.13 -stdlib=libc++ # macOS (Metal, x86 64bit)
else ifeq ($(shell uname -p),powerpc)
MINVERSION = -mmacosx-version-min=10.5 # macOSX (PowerPC 32-bit)
DARWINFLAGS = -mmacosx-version-min=10.5 # macOSX (PowerPC 32-bit)
else ifeq ($(shell uname -m),i386)
MINVERSION = -mmacosx-version-min=10.6 # macOSX (OpenGL, x86 32bit)
DARWINFLAGS = -mmacosx-version-min=10.6 # macOSX (OpenGL, x86 32bit)
else
MINVERSION = -mmacosx-version-min=10.7 -stdlib=libc++ # macOSX (OpenGL, x86 64bit)
DARWINFLAGS = -mmacosx-version-min=10.7 -stdlib=libc++ # macOSX (OpenGL, x86 64bit)
endif
DEF_FLAGS += $(MINVERSION)
LDFLAGS += $(MINVERSION)
# Build for a specific architecture when ARCH is defined as a switch
ifeq ($(ARCH),arm64)
DARWINFLAGS += -arch arm64
else ifeq($(ARCH),x86_64)
DARWINFLAGS += -arch x86_64
else ifeq($(ARCH),x86)
DARWINFLAGS += -arch x86
else ifeq($(ARCH),ppc)
DARWINFLAGS += -arch ppc
endif
DEF_FLAGS += $(DARWINFLAGS)
LDFLAGS += $(DARWINFLAGS)
else
OSX := 0
endif