X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=extras%2Fcontrib%2Fbootstrap;h=1145476b8afd1ab34cf58c824d3d4a45a343db0b;hb=97d83d04dbd7c04d78d9e6c7581deb3f26700970;hp=749541e229d01c95e9435ac67d1444b60f7a9967;hpb=c1bc979ea72d16d07515a214a4adce210896e467;p=vlc

diff --git a/extras/contrib/bootstrap b/extras/contrib/bootstrap
index 749541e229..1145476b8a 100755
--- a/extras/contrib/bootstrap
+++ b/extras/contrib/bootstrap
@@ -162,6 +162,9 @@ case $HOST in
             echo "ERROR:\nYour Developer Tools' SDKs were not found.\nYou need to add extra symbolic links to /Developer to achieve correctly\nbuilt contribs.\nHave a look at the OSX-Compile-HOWTO for details." >&2
             exit 1
         fi
+        if test $HOST="i686-apple-darwin10"; then
+            echo "HAVE_DARWIN_10 = 1" >> config.mak
+        fi
     ;;
     x86_64-apple-darwin*)
         SDK_TARGET=10.5
@@ -182,13 +185,16 @@ case $HOST in
         RANLIB="ranlib"
         AR="ar"
         STRIP="strip"
-        DISTRO=darwin
+        DISTRO=darwin64
         if test -e /Developer/SDKs; then
             echo "SDKs found. Everything is fine." >&2
         else
             echo "ERROR:\nYour Developer Tools' SDKs were not found.\nYou need to add extra symbolic links to /Developer to achieve correctly\nbuilt contribs.\nHave a look at the OSX-Compile-HOWTO for details." >&2
             exit 1
         fi
+        if test $HOST="x86_64-apple-darwin10"; then
+            echo "HAVE_DARWIN_10 = 1" >> config.mak
+        fi
     ;;
     *mingw32ce)
         echo "HAVE_WINCE = 1" >> config.mak
@@ -235,9 +241,7 @@ case $HOST in
             DISTRO=maemo
             echo 'HAVE_MAEMO = 1' >> config.mak
             EXTRA_CFLAGS=" -mcpu=cortex-a8 -mtune=cortex-a8 -march=armv7-a"
-            EXTRA_CLFAGS="$EXTRA_CFLAGS -mfpu=neon"
-            EXTRA_CFLAGS="$EXTRA_CFLAGS -mthumb -mthumb-interwork"
-            echo 'HAVE_ISA_THUMB = 1' >> config.mak
+            EXTRA_CFLAGS="$EXTRA_CFLAGS -mfpu=neon"
         else
             EXTRA_CFLAGS="-msoft-float"
         fi