ios: unbreak freetype contrib compilation with Xcode 5 and simplify the FLAG handling...

diff --git a/contrib/bootstrap b/contrib/bootstrap
index 5246200d46811c44c0cba40e96fc68f236533d5c..f0bfe917f754163fab4b783895cfa1a3aaa36d13 100755 (executable)
--- a/contrib/bootstrap
+++ b/contrib/bootstrap
@@ -177,24 +177,6 @@ check_macosx_sdk()
    add_make "OSX_VERSION ?= ${OSX_VERSION}"
 }
 
-check_ios_sdk()
-{
-       if test -z "$SDKROOT"
-       then
-               SDKROOT=`xcode-select -print-path`/Platforms/iPhone${PLATFORM}.platform/Developer/SDKs/iPhone${PLATFORM}${SDK_VERSION}.sdk
-               echo "SDKROOT not specified, assuming $SDKROOT"
-       else
-               SDKROOT="$SDKROOT"
-       fi
-
-       if [ ! -d "${SDKROOT}" ]
-       then
-               echo "*** ${SDKROOT} does not exist, please install required SDK, or set SDKROOT manually. ***"
-               exit 1
-       fi
-       add_make "SDKROOT=${SDKROOT}"
-}
-
 check_android_sdk()
 {
        [ -z "${ANDROID_NDK}" ] && echo "You must set ANDROID_NDK environment variable" && exit 1
@@ -224,7 +206,6 @@ case "${OS}" in
                        check_macosx_sdk
                        add_make_enabled "HAVE_MACOSX" "HAVE_DARWIN_OS" "HAVE_BSD"
                else
-                       check_ios_sdk
                        add_make_enabled "HAVE_IOS" "HAVE_DARWIN_OS" "HAVE_BSD" "HAVE_NEON" "HAVE_ARMV7A"
                fi
                ;;

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index 3022b1df3058cd430ebc0c2d203c955724375a5e..2b6bb9d6f763f01d6fcb961122fd5555beac443b 100644 (file)
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -138,8 +138,8 @@ AR=xcrun ar
 LD=xcrun ld
 STRIP=xcrun strip
 RANLIB=xcrun ranlib
-EXTRA_CFLAGS += -isysroot $(SDKROOT)
-EXTRA_LDFLAGS += -Wl,-syslibroot,$(SDKROOT) -isysroot $(SDKROOT)
+EXTRA_CFLAGS += $(CFLAGS)
+EXTRA_LDFLAGS += $(LDFLAGS)
 endif
 
 ifdef HAVE_WIN32

diff --git a/extras/package/ios/build.sh b/extras/package/ios/build.sh
index 6ad4686072261caa0cc2bc1cb53af9b71e98d00f..cb8c1f01db6182d3ef39e1546f126ebbc2fadbe0 100755 (executable)
--- a/extras/package/ios/build.sh
+++ b/extras/package/ios/build.sh
@@ -137,7 +137,6 @@ export LD="xcrun ld"
 export STRIP="xcrun strip"
 
 
-export SDKROOT
 CFLAGS="-isysroot ${SDKROOT} -arch ${ARCH} -miphoneos-version-min=${SDK_MIN} ${OPTIM}"
 if [ "$ARCH" = "armv7" -o "$ARCH" = "armv7s" ]; then
 CFLAGS+=" -mcpu=cortex-a8"
@@ -157,11 +156,7 @@ if [ "$PLATFORM" = "Simulator" ]; then
     export OBJCFLAGS="-fobjc-abi-version=2 -fobjc-legacy-dispatch ${OBJCFLAGS}"
 fi
 
-if [ "$PLATFORM" = "OS" ]; then
-  export LDFLAGS="-L${SDKROOT}/usr/lib -arch ${ARCH} -isysroot ${SDKROOT} -miphoneos-version-min=${SDK_MIN}"
-else
-  export LDFLAGS="-syslibroot=${SDKROOT}/ -arch ${ARCH} -miphoneos-version-min=${SDK_MIN}"
-fi
+export LDFLAGS="-L${SDKROOT}/usr/lib -arch ${ARCH} -isysroot ${SDKROOT} -miphoneos-version-min=${SDK_MIN}"
 
 if [ "$PLATFORM" = "OS" ]; then
     EXTRA_CFLAGS="-arch ${ARCH} ${CFLAGS}"