Contribs: simplify libav/FFmpeg rules as suggested by DonDiego

[vlc] / contrib / bootstrap

diff --git a/contrib/bootstrap b/contrib/bootstrap
index bf4416244d26e7a3bb8bc5d09e3432088861aece..0567a57d0166702bb96d41e215cb26b45b0c02fd 100755 (executable)
--- a/contrib/bootstrap
+++ b/contrib/bootstrap
@@ -143,23 +143,56 @@ add_make_enabled()
 
 check_macosx_sdk()
 {
-   [ -z "${OSX_VERSION}" ] && echo "OSX_VERSION not specified, assuming 10.5" && OSX_VERSION=10.5
-   SDK="/Developer/SDKs/MacOSX${OSX_VERSION}.sdk"
-   if [ ! -d "${SDK}" ]
+   [ -z "${OSX_VERSION}" ] && echo "OSX_VERSION not specified, assuming 10.7" && OSX_VERSION=10.7
+   if test -z "$SDKROOT"
    then
-          echo "
-*** ${SDK} does not exist, please install required SDK, or use export OSX_VERSION=10.6 ***
-"
-          exit 1
+      SDKROOT=`xcode-select -print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$OSX_VERSION.sdk
+      echo "SDKROOT not specified, assuming $SDKROOT"
    fi
+
+   if [ ! -d "${SDKROOT}" ]
+   then
+      SDKROOT_NOT_FOUND=`xcode-select -print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$OSX_VERSION.sdk
+      SDKROOT=`xcode-select -print-path`/SDKs/MacOSX$OSX_VERSION.sdk
+      echo "SDKROOT not found at $SDKROOT_NOT_FOUND, trying $SDKROOT"
+   fi
+
+   if [ ! -d "${SDKROOT}" ]
+   then
+      echo "*** ${SDKROOT} does not exist, please install required SDK, or set SDKROOT manually. ***"
+      exit 1
+   fi
+
+   add_make "MACOSX_SDK=${SDKROOT}"
    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
        add_make "ANDROID_NDK := ${ANDROID_NDK}"
+       [ -z "${ANDROID_ABI}" ] && echo "You must set ANDROID_ABI environment variable" && exit 1
+       add_make "ANDROID_ABI := ${ANDROID_ABI}"
        test -z "${NO_NEON}" && add_make_enabled "HAVE_NEON"
+       [ ${ANDROID_ABI} = "armeabi-v7a" ] && add_make_enabled "HAVE_ARMV7A"
 }
 
 test -z "$PREFIX" || add_make "PREFIX := $PREFIX"
@@ -172,24 +205,33 @@ test -z "$ENABLE_SMALL" || add_make_enabled "ENABLE_SMALL"
 #
 OS="${HOST#*-}" # strip architecture
 case "${OS}" in
-       arm-apple-darwin*)
-               add_make_enabled "HAVE_IOS" "HAVE_DARWIN_OS" "HAVE_BSD"
-               ;;
-       *86*-apple-darwin*)
-               check_macosx_sdk
-               add_make_enabled "HAVE_MACOSX" "HAVE_DARWIN_OS" "HAVE_BSD"
-               ;;
-       powerpc-apple-darwin*)
-               check_macosx_sdk
-               add_make_enabled "HAVE_MACOSX" "HAVE_DARWIN_OS" "HAVE_BSD"
+       apple-darwin*)
+               if test -z "$BUILDFORIOS"
+               then
+                       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
                ;;
        *bsd*)
                add_make_enabled "HAVE_BSD"
                ;;
-       linux-androideabi)
+       *android*)
                check_android_sdk
                add_make_enabled "HAVE_LINUX" "HAVE_ANDROID"
-               add_make "PATH = ${ANDROID_NDK}/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/:${PATH}"
+               case "${HOST}" in
+                       *arm*)
+                       add_make "PLATFORM_SHORT_ARCH := arm"
+                       ;;
+                       *i686*)
+                       add_make "PLATFORM_SHORT_ARCH := x86"
+                       ;;
+                       *mipsel*)
+                       add_make "PLATFORM_SHORT_ARCH := mips"
+                       ;;
+               esac
                ;;
        *linux*)
                add_make_enabled "HAVE_LINUX"