diff --git a/libretro-build-ios10.sh b/libretro-build-ios10.sh new file mode 100644 index 00000000..7f51772c --- /dev/null +++ b/libretro-build-ios10.sh @@ -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 $@ diff --git a/libretro-config.sh b/libretro-config.sh index f2b1456c..4d895234 100755 --- a/libretro-config.sh +++ b/libretro-config.sh @@ -240,15 +240,33 @@ 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 - IOS=1 - ARCH=arm64 - FORMAT=_ios - FORMAT_COMPILER_TARGET=ios-arm64 - FORMAT_COMPILER_TARGET_ALT=ios-arm64 - export IOSSDK=$(xcodebuild -version -sdk iphoneos Path) + DIST_DIR="ios-arm64" + FORMAT_EXT=dylib + IOS=1 + ARCH=arm64 + FORMAT=_ios + 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"