Getting ready for theos merge into libretro-build.sh

This commit is contained in:
T. Joseph Carter 2015-03-09 05:33:41 -07:00
parent 5093fe6088
commit d02ff168c6

View File

@ -13,13 +13,10 @@ case "$platform" in
## ##
ios) ios)
# NOTE: This config requires a Mac with an Xcode version new enough for # NOTE: This config requires a Mac with an Xcode installation. These
# its xcrun program to support -show-sdk-path. That pretty much # scripts will work at least as far as 10.5 that we're sure of, but
# limits us to Xcode 5 and above unless someone wants to implement # we build with clang targeting iOS >= 5. We'll accept patches for
# older Xcode version support using an alternate method. Any such # older versions of iOS.
# support could only be for jailbreakers as any libretro core that
# could ever be added to the App Store would require a recent SDK
# and Xcode version to build.
DIST_DIR="ios" DIST_DIR="ios"
FORMAT_EXT=dylib FORMAT_EXT=dylib
@ -34,13 +31,28 @@ case "$platform" in
IOSVER_MINOR=${iosver#*.} IOSVER_MINOR=${iosver#*.}
IOSVER=${IOSVER_MAJOR}${IOSVER_MINOR} IOSVER=${IOSVER_MAJOR}${IOSVER_MINOR}
# Apple requires this stuff # Tell system clang to build for iOS
CC="clang -arch armv7 -miphoneos-version-min=5.0 -isysroot $IOSSDK" CC="clang -arch armv7 -miphoneos-version-min=5.0 -isysroot $IOSSDK"
CXX="clang++ -arch armv7 -miphoneos-version-min=5.0 -isysroot $IOSSDK" CXX="clang++ -arch armv7 -miphoneos-version-min=5.0 -isysroot $IOSSDK"
CXX11="clang++ -std=c++11 -stdlib=libc++ -arch armv7 -miphoneos-version-min=5.0 -isysroot $IOSSDK" CXX11="clang++ -std=c++11 -stdlib=libc++ -arch armv7 -miphoneos-version-min=5.0 -isysroot $IOSSDK"
;; ;;
theos_ios)
DIST_DIR="theos_ios"
BUILD_PRODUCT_PREFIX="objs/obj"
FORMAT_EXT=dylib
IOS=1
ARCH=armv7
FORMAT=_ios
FORMAT_COMPILER_TARGET=theos_ios
FORMAT_COMPILER_TARGET_ALT=theos_ios
# Make sure that the cross bins you need are first in your path
CXX11="clang++ -std=c++11 -stdlib=libc++ -miphoneos-version-min=5.0"
;;
## ##
## Original libretro-config path ## Original libretro-config path
## ##
@ -105,10 +117,10 @@ case "$platform" in
FORMAT_COMPILER_TARGET="psp1" FORMAT_COMPILER_TARGET="psp1"
DIST_DIR="psp1" DIST_DIR="psp1"
;; ;;
*ios|theos_ios*) theos_ios*)
FORMAT_EXT="dylib" FORMAT_EXT="dylib"
FORMAT_COMPILER_TARGET="theos_ios" FORMAT_COMPILER_TARGET="theos_ios"
DIST_DIR="theos" DIST_DIR="theos_ios"
;; ;;
android) android)
FORMAT_EXT="so" FORMAT_EXT="so"