Contribs: simplify libav/FFmpeg rules as suggested by DonDiego

[vlc] / contrib / bootstrap

diff --git a/contrib/bootstrap b/contrib/bootstrap
index 3972f6fc8061091f93d404e57f4efab4e06c5b85..0567a57d0166702bb96d41e215cb26b45b0c02fd 100755 (executable)
--- a/contrib/bootstrap
+++ b/contrib/bootstrap
@@ -143,7 +143,7 @@ add_make_enabled()
 
 check_macosx_sdk()
 {
-   [ -z "${OSX_VERSION}" ] && echo "OSX_VERSION not specified, assuming 10.6" && OSX_VERSION=10.6
+   [ -z "${OSX_VERSION}" ] && echo "OSX_VERSION not specified, assuming 10.7" && OSX_VERSION=10.7
    if test -z "$SDKROOT"
    then
       SDKROOT=`xcode-select -print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$OSX_VERSION.sdk
@@ -163,6 +163,7 @@ check_macosx_sdk()
       exit 1
    fi
 
+   add_make "MACOSX_SDK=${SDKROOT}"
    add_make "OSX_VERSION ?= ${OSX_VERSION}"
 }
 
@@ -191,6 +192,7 @@ check_android_sdk()
        [ -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"
@@ -210,7 +212,7 @@ case "${OS}" in
                        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"
+                       add_make_enabled "HAVE_IOS" "HAVE_DARWIN_OS" "HAVE_BSD" "HAVE_NEON" "HAVE_ARMV7A"
                fi
                ;;
        *bsd*)
@@ -221,15 +223,12 @@ case "${OS}" in
                add_make_enabled "HAVE_LINUX" "HAVE_ANDROID"
                case "${HOST}" in
                        *arm*)
-                       add_make "PATH = ${ANDROID_NDK}/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/:${PATH}"
                        add_make "PLATFORM_SHORT_ARCH := arm"
                        ;;
                        *i686*)
-                       add_make "PATH = ${ANDROID_NDK}/toolchains/x86-4.4.3/prebuilt/linux-x86/bin/:${PATH}"
                        add_make "PLATFORM_SHORT_ARCH := x86"
                        ;;
                        *mipsel*)
-                       add_make "PATH = ${ANDROID_NDK}/toolchains/mipsel-linux-android-4.4.3/prebuilt/linux-x86/bin/:${PATH}"
                        add_make "PLATFORM_SHORT_ARCH := mips"
                        ;;
                esac