Unverified Commit 835443a4 authored by Ignacio Sanchez Gines's avatar Ignacio Sanchez Gines
Browse files

Add ios-arm64/tvos-arm64/osx-arm64 for libretro

parent 7bc0d874
Pipeline #17315 passed with stages
in 6 minutes and 51 seconds
......@@ -38,8 +38,12 @@ include:
# Android
- project: 'libretro-infrastructure/ci-templates'
file: '/android-jni.yml'
# iOS 9
# iOS
- project: 'libretro-infrastructure/ci-templates'
file: '/ios-arm64.yml'
# iOS (armv7)
- project: 'libretro-infrastructure/ci-templates'
file: '/ios9.yml'
......@@ -207,4 +211,4 @@ libretro-build-libnx-aarch64:
libretro-build-emscripten:
extends:
- .libretro-emscripten-static-retroarch-master
- .core-defs
\ No newline at end of file
- .core-defs
......@@ -25,6 +25,9 @@ else ifneq ($(findstring Darwin,$(shell uname -a)),)
ifeq ($(shell uname -p),powerpc)
arch = ppc
endif
ifeq ($(shell uname -p),arm)
arch = arm
endif
else ifneq ($(findstring MINGW,$(shell uname -a)),)
system_platform = win
endif
......@@ -35,19 +38,17 @@ SOURCE_DIR += ../../src
TARGET_NAME := gearsystem
LIBM = -lm
ifeq ($(ARCHFLAGS),)
ifeq ($(UNIVERSAL),1)
ifeq ($(archs),ppc)
ARCHFLAGS = -arch ppc -arch ppc64
else ifeq ($(archs),arm)
ARCHFLAGS = -arch arm64 -arch ppc64
else
ARCHFLAGS = -arch i386 -arch x86_64
endif
endif
ifeq ($(platform), osx)
ifndef ($(NOUNIVERSAL))
CXXFLAGS += $(ARCHFLAGS)
LFLAGS += $(ARCHFLAGS)
endif
LFLAGS += $(ARCHFLAGS)
endif
ifeq ($(STATIC_LINKING), 1)
......@@ -156,11 +157,24 @@ else ifneq (,$(findstring osx,$(platform)))
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
CFLAGS += $(ARCHFLAGS)
CXXFLAGS += $(ARCHFLAGS)
LDFLAGS += $(ARCHFLAGS)
# iOS
else ifneq (,$(findstring ios,$(platform)))
TARGET := $(TARGET_NAME)_libretro_ios.dylib
fpic := -fPIC
SHARED := -dynamiclib
MINVERSION :=
ifeq ($(IOSSDK),)
IOSSDK := $(shell xcodebuild -version -sdk iphoneos Path)
endif
......@@ -172,14 +186,11 @@ else ifneq (,$(findstring ios,$(platform)))
CXX = c++ -arch armv7 -isysroot $(IOSSDK)
endif
ifeq ($(platform),$(filter $(platform),ios9 ios-arm64))
CC += -miphoneos-version-min=8.0
CXX += -miphoneos-version-min=8.0
PLATFORM_DEFINES := -miphoneos-version-min=8.0
MINVERSION = -miphoneos-version-min=8.0
else
CC += -miphoneos-version-min=5.0
CXX += -miphoneos-version-min=5.0
PLATFORM_DEFINES := -miphoneos-version-min=5.0
MINVERSION = -miphoneos-version-min=5.0
endif
PLATFORM_DEFINES := $(MINVERSION)
# tvOS
else ifeq ($(platform), tvos-arm64)
TARGET := $(TARGET_NAME)_libretro_tvos.dylib
......@@ -188,6 +199,10 @@ else ifeq ($(platform), tvos-arm64)
ifeq ($(IOSSDK),)
IOSSDK := $(shell xcodebuild -version -sdk appletvos Path)
endif
CC = cc -arch arm64 -isysroot $(IOSSDK)
CXX = c++ -arch arm64 -isysroot $(IOSSDK)
# QNX
else ifneq (,$(findstring qnx,$(platform)))
TARGET := $(TARGET_NAME)_libretro_qnx.so
......@@ -244,7 +259,7 @@ endif
LDFLAGS += $(LIBM)
ifeq ($(DEBUG), 1)
CXXFLAGS += -O0 -g -DDEBUG
CXXFLAGS += -O0 -DDEBUG -g
else
CXXFLAGS += -O3
endif
......@@ -261,13 +276,11 @@ CXXFLAGS += -DGEARSYSTEM_DISABLE_DISASSEMBLER -Wall -D__LIBRETRO__ $(fpic)
all: $(TARGET)
$(TARGET): $(OBJECTS)
@echo "** BUILDING $(TARGET) FOR PLATFORM $(platform) **"
ifeq ($(STATIC_LINKING), 1)
$(AR) rcs $@ $(OBJECTS)
else
$(CXX) $(fpic) $(SHARED) $(INCLUDES) -o $@ $(OBJECTS) $(LDFLAGS)
endif
@echo "** BUILD SUCCESSFUL! **"
%.o: %.c
$(CXX) $(CXXFLAGS) $(fpic) -c -o $@ $<
......
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