X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=contrib%2Fbootstrap;h=4d2b826a86fe2c823fccb6febcaf3a5e75a3db7e;hb=d0fca170ce1b4352a1ad19cbdbbd4d7c29d07dc2;hp=f0bfe917f754163fab4b783895cfa1a3aaa36d13;hpb=0b0545eb37958da19027b21ca014c4152ea3535d;p=vlc

diff --git a/contrib/bootstrap b/contrib/bootstrap
index f0bfe917f7..4d2b826a86 100755
--- a/contrib/bootstrap
+++ b/contrib/bootstrap
@@ -98,7 +98,7 @@ done
 if test -z "$BUILD"
 then
 	echo -n "Guessing build system... "
-	BUILD="`cc -dumpmachine`"
+	BUILD="`${CC:-cc} -dumpmachine`"
 	if test -z "$BUILD"; then
 		echo "FAIL!"
 		exit 1
@@ -151,9 +151,31 @@ add_make_enabled()
 	done
 }
 
+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 "IOS_SDK=${SDKROOT}"
+}
+
 check_macosx_sdk()
 {
-   [ -z "${OSX_VERSION}" ] && echo "OSX_VERSION not specified, assuming 10.7" && OSX_VERSION=10.7
+   if [ -z "${OSX_VERSION}" ]
+   then
+      OSX_VERSION=`xcrun --show-sdk-version`
+      echo "OSX_VERSION not specified, assuming $OSX_VERSION"
+   fi
    if test -z "$SDKROOT"
    then
       SDKROOT=`xcode-select -print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$OSX_VERSION.sdk
@@ -166,6 +188,12 @@ check_macosx_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
+      SDKROOT_NOT_FOUND="$SDKROOT"
+      SDKROOT=`xcrun --show-sdk-path`
+      echo "SDKROOT not found at $SDKROOT_NOT_FOUND, trying $SDKROOT"
+   fi
 
    if [ ! -d "${SDKROOT}" ]
    then
@@ -183,8 +211,12 @@ check_android_sdk()
 	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}"
+	[ -z "${ANDROID_API}" ] && echo "You should set ANDROID_API environment variable (using default android-9)" && ANDROID_API := android-9
+	add_make "ANDROID_API := ${ANDROID_API}"
 	[ ${ANDROID_ABI} = "armeabi-v7a" ] && add_make_enabled "HAVE_NEON"
 	[ ${ANDROID_ABI} = "armeabi-v7a" ] && add_make_enabled "HAVE_ARMV7A"
+	[ ${ANDROID_ABI} = "arm64-v8a" ] && add_make_enabled "HAVE_NEON"
+	[ ${ANDROID_ABI} = "arm64-v8a" ] && add_make_enabled "HAVE_ARMV8A"
 	[ ${ANDROID_ABI} = "armeabi" -a -z "${NO_ARMV6}" ] && add_make_enabled "HAVE_ARMV6"
 }
 
@@ -206,7 +238,14 @@ case "${OS}" in
 			check_macosx_sdk
 			add_make_enabled "HAVE_MACOSX" "HAVE_DARWIN_OS" "HAVE_BSD"
 		else
-			add_make_enabled "HAVE_IOS" "HAVE_DARWIN_OS" "HAVE_BSD" "HAVE_NEON" "HAVE_ARMV7A"
+			check_ios_sdk
+			add_make_enabled "HAVE_IOS" "HAVE_DARWIN_OS" "HAVE_BSD" "HAVE_FPU"
+
+			case "${HOST}" in
+				*arm*)
+				add_make_enabled "HAVE_NEON" "HAVE_ARMV7A"
+				;;
+			esac;
 		fi
 		;;
 	*bsd*)
@@ -219,9 +258,15 @@ case "${OS}" in
 			*arm*)
 			add_make "PLATFORM_SHORT_ARCH := arm"
 			;;
+			*arm64*|*aarch64*)
+			add_make "PLATFORM_SHORT_ARCH := arm64"
+			;;
 			*i686*)
 			add_make "PLATFORM_SHORT_ARCH := x86"
 			;;
+			*x86_64*)
+			add_make "PLATFORM_SHORT_ARCH := x86_64"
+			;;
 			*mipsel*)
 			add_make "PLATFORM_SHORT_ARCH := mips"
 			;;
@@ -230,12 +275,12 @@ case "${OS}" in
 	*linux*)
 		add_make_enabled "HAVE_LINUX"
 		;;
-	*wince*)
-		add_make_enabled "HAVE_WINCE"
-		;;
 	*mingw*)
 		add_make_enabled "HAVE_WIN32"
 		;;
+	*solaris*)
+		add_make_enabled "HAVE_SOLARIS"
+		;;
 esac
 
 #