Merge pull request #1048 from WeedyWeedSmoker/Add-iOS-10-target-(FAT-binary)

Add iOS 10 target (FAT binary)
This commit is contained in:
Twinaphex 2019-06-03 03:07:51 +02:00 committed by GitHub
commit 44a65bc6cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 43 additions and 8 deletions

17
libretro-build-ios10.sh Normal file
View File

@ -0,0 +1,17 @@
#! /usr/bin/env bash
# vim: set ts=3 sw=3 noet ft=sh : bash
SCRIPT="${0#./}"
BASE_DIR="${SCRIPT%/*}"
WORKDIR="$PWD"
if [ "$BASE_DIR" = "$SCRIPT" ]; then
BASE_DIR="$WORKDIR"
else
if [[ "$0" != /* ]]; then
# Make the path absolute
BASE_DIR="$WORKDIR/$BASE_DIR"
fi
fi
platform=ios10 ${BASE_DIR}/libretro-build.sh $@

View File

@ -240,6 +240,22 @@ case "$platform" in
CXX11="clang++ -std=c++11 -stdlib=libc++ -arch armv7 -marm -miphoneos-version-min=8.0 -isysroot $IOSSDK"
;;
ios10)
DIST_DIR="ios10"
FORMAT_EXT=dylib
IOS=1
ARCH=armv7 arm64
FORMAT=_ios
FORMAT_COMPILER_TARGET=ios10
FORMAT_COMPILER_TARGET_ALT=ios10
export IOSSDK=$(xcodebuild -version -sdk iphoneos Path)
# Use generic names rather than gcc/clang to better support both
CC="cc -arch armv7 -arch arm64 -marm -miphoneos-version-min=8.0 -isysroot $IOSSDK"
CXX="c++ -arch armv7 -arch arm64 -marm -miphoneos-version-min=8.0 -isysroot $IOSSDK"
CXX11="clang++ -std=c++11 -stdlib=libc++ -arch armv7 -arch arm64 -marm -miphoneos-version-min=8.0 -isysroot $IOSSDK"
;;
ios-arm64)
DIST_DIR="ios-arm64"
FORMAT_EXT=dylib
@ -249,6 +265,8 @@ case "$platform" in
FORMAT_COMPILER_TARGET=ios-arm64
FORMAT_COMPILER_TARGET_ALT=ios-arm64
export IOSSDK=$(xcodebuild -version -sdk iphoneos Path)
# Use generic names rather than gcc/clang to better support both
CC="cc -arch arm64 -marm -miphoneos-version-min=8.0 -isysroot $IOSSDK"
CXX="c++ -arch arm64 -marm -miphoneos-version-min=8.0 -isysroot $IOSSDK"
CXX11="clang++ -std=c++11 -stdlib=libc++ -arch arm64 -marm -miphoneos-version-min=8.0 -isysroot $IOSSDK"