X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=extras%2Fcontrib%2Fbootstrap;h=ac39d960638cdb30c815f1ff7aba907adaf63881;hb=9e94d8105c8d858b8d419290648126627c807572;hp=0b02b77bdf425a142bb7a6fd87661095260b6e68;hpb=3dcadf773561433005989406f36d45ed1d63d515;p=vlc

diff --git a/extras/contrib/bootstrap b/extras/contrib/bootstrap
index 0b02b77bdf..ac39d96063 100755
--- a/extras/contrib/bootstrap
+++ b/extras/contrib/bootstrap
@@ -33,7 +33,7 @@ fi
 LANG=C
 export LANG
 set -e
-set -x
+set +x
 
 BUILD=`gcc -dumpmachine`
 if test "$#" -ge "1"; then
@@ -80,6 +80,9 @@ case $HOST in
     *86*)
           ARCH="i386"
      ;;
+    arm*eabi)
+          ARCH="armel"
+     ;;
 esac
 echo "ARCH = $ARCH" >> config.mak
 
@@ -127,7 +130,7 @@ case $HOST in
         CXX="/Developer/usr/bin/g++-4.2"
         LD="ld -arch ppc -syslibroot \${MACOSX_SDK} -mmacosx-version-min=\${SDK_TARGET}"
         echo "PATH = /bin:/usr/bin:/usr/local/bin:" >> config.mak
-        cat src/Distributions/darwin.mak >> distro.mak
+        DISTRO=darwin
         if test -e /Developer/SDKs; then
             echo "SDKs found. Everything is fine." >&2
         else
@@ -155,13 +158,16 @@ case $HOST in
         CC="/Developer/usr/bin/gcc-4.2"
         CXX="/Developer/usr/bin/g++-4.2"
         echo "PATH = /bin:/usr/bin:/usr/local/bin" >> config.mak
-        cat src/Distributions/darwin.mak >> distro.mak
+        DISTRO=darwin
         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 = "i686-apple-darwin10"; then
+            echo "HAVE_DARWIN_10 = 1" >> config.mak
+        fi
     ;;
     x86_64-apple-darwin*)
         SDK_TARGET=10.5
@@ -174,7 +180,7 @@ case $HOST in
         CFLAGS_TUNING=" -march=core2 -mtune=core2 -m64 -arch x86_64"
         echo "HAVE_DARWIN_64 = 1" >> config.mak
         EXTRA_CFLAGS=" -D\${ENVP} -isysroot \${MACOSX_SDK} -mmacosx-version-min=\${SDK_TARGET}"
-        EXTRA_LDFLAGS=" -isysroot \${MACOSX_SDK} -Wl,-syslibroot,\${MACOSX_SDK} -mmacosx-version-min=\${SDK_TARGET}"
+        EXTRA_LDFLAGS=" -arch x86_64 -isysroot \${MACOSX_SDK} -Wl,-syslibroot,\${MACOSX_SDK} -mmacosx-version-min=\${SDK_TARGET}"
         echo "PATH = /bin:/usr/bin:/usr/local/bin" >> config.mak
         CC="/Developer/usr/bin/gcc-4.2"
         CXX="/Developer/usr/bin/g++-4.2"
@@ -182,31 +188,35 @@ case $HOST in
         RANLIB="ranlib"
         AR="ar"
         STRIP="strip"
-        cat src/Distributions/darwin.mak >> distro.mak
+        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
         echo "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig" >> config.mak
-        cat src/Distributions/wince.mak >> distro.mak
+        EXTRA_CPPFLAGS=" -D_WIN32_WCE=0x0500"
+        DISTRO=wince
     ;;
-    x86_64-*-mingw*)
+    *64-*mingw*)
         echo "HAVE_WIN64 = 1" >> config.mak
         echo "HAVE_WIN32 = 1" >> config.mak
         echo "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig" >> config.mak
            EXTRA_CFLAGS="-O3"
-        cat src/Distributions/win64.mak >> distro.mak
+        DISTRO=win64
     ;;
     *mingw32*)
         echo "HAVE_WIN32 = 1" >> config.mak
         echo "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig" >> config.mak
-        EXTRA_CFLAGS="-O3"
-        cat src/Distributions/win32.mak >> distro.mak
+        EXTRA_CFLAGS=" -O3 -march=i686 -mtune=generic"
+        DISTRO=win32
     ;;
     i686-pc-cygwin)
         echo "HAVE_WIN32 = 1" >> config.mak
@@ -218,31 +228,25 @@ case $HOST in
         EXTRA_CPPFLAGS=" -mno-cygwin -isystem /usr/include/mingw"
         EXTRA_LDFLAGS=" -mno-cygwin"
         echo "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig" >> config.mak
-        cat src/Distributions/win32.mak >> distro.mak
+        DISTRO=win32
     ;;
     arm-wince-pe)
         echo "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig" >> config.mak
         EXTRA_CPPFLAGS=" -D_WIN32_WCE"
-        cat src/Distributions/wince.mak >> distro.mak
+        DISTRO=wince
     ;;
     armeb-linux-uclibc)
         echo "HAVE_UCLIBC = 1" >> config.mak
         echo "HAVE_BIGENDIAN = 1" >> config.mak
         EXTRA_CFLAGS="-Os -march=armv5 -msoft-float"
-        if test ! -z "${DISTRO}";  then
-            cat src/Distributions/${DISTRO}.mak >> distro.mak
-        else
-            cat src/Distributions/unix.mak >> distro.mak
-        fi
     ;;
     arm-none-linux-gnueabi)
         if test -f /etc/maemo_version; then
-            cat src/Distributions/maemo.mak >> distro.mak
+            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 -mfloat-abi=softfp"
+            EXTRA_CFLAGS="$EXTRA_CFLAGS -O3 -fno-tree-vectorize"
         else
             EXTRA_CFLAGS="-msoft-float"
         fi
@@ -257,40 +261,38 @@ case $HOST in
     ;;
 esac
 
-if ! test -f distro.mak; then
-    if test ! -z "${DISTRO}";  then
-        cat src/Distributions/${DISTRO}.mak >> distro.mak
-    elif test "$HOST" = "$BUILD"; then
-        if test -d "/usr/lib/pkgconfig"; then
-            if test -z "$PKG_CONFIG_PATH"; then
-                echo "PKG_CONFIG_PATH = /usr/lib/pkgconfig" >> config.mak
-            fi
-            if test -z "$PKG_CONFIG_LIBDIR"; then
-                echo "PKG_CONFIG_LIBDIR = /usr/lib/pkgconfig" >> config.mak
-            fi
+if test -z "${DISTRO}" -a "$HOST" = "$BUILD"; then
+    if test -d "/usr/lib/pkgconfig"; then
+        if test -z "$PKG_CONFIG_PATH"; then
+            echo "PKG_CONFIG_PATH = /usr/lib/pkgconfig" >> config.mak
         fi
-        # Try to match distribution
-        if test -f /etc/fedora-release; then
-            cat src/Distributions/fedora.mak >> distro.mak
-        elif test -f /etc/maemo_version; then
-            cat src/Distributions/maemo.mak >> distro.mak
-            echo 'HAVE_MAEMO = 1' >> config.mak
-        elif test -f /etc/debian_version; then
-            # NOTE: check for Debian *after* its derivatives
-            cat src/Distribution/debian.mak >> distro.mak
+        if test -z "$PKG_CONFIG_LIBDIR"; then
+            echo "PKG_CONFIG_LIBDIR = /usr/lib/pkgconfig" >> config.mak
         fi
     fi
+    # Try to match distribution
+    if test -f /etc/fedora-release; then
+        DISTRO=fedora
+    elif test -f /etc/maemo_version; then
+        DISTRO=maemo
+        echo 'HAVE_MAEMO = 1' >> config.mak
+    elif test -f /etc/debian_version; then
+        # NOTE: check for Debian *after* its derivatives
+        DISTRO=debian
+    fi
 fi
 
-if ! test -f distro.mak; then
-    # Default Unix-like systems
-    cat src/Distributions/unix.mak >> distro.mak
-fi
+# Default Unix-like systems
+test -z "${DISTRO}" && DISTRO=unix
+
+cat src/Distributions/"${DISTRO}".mak >> distro.mak
 
 echo "BUILD = $BUILD" >> config.mak
 echo "HOST = $HOST" >> config.mak
 
-echo "PREFIX = `pwd`" >> config.mak
+echo "PREFIX = `pwd`/hosts/$HOST" >> config.mak
+
+ln -sfn hosts/$HOST build 
 
 echo "CC = ${CC}" >> config.mak
 echo "CXX = ${CXX}" >> config.mak
@@ -303,6 +305,19 @@ echo "EXTRA_CPPFLAGS = ${EXTRA_CPPFLAGS} -isystem \$(PREFIX)/include" >> config.
 echo "EXTRA_LDFLAGS = ${EXTRA_LDFLAGS}" >> config.mak
 echo "EXTRA_PATH = ${EXTRA_PATH}" >> config.mak
 
+#CMAKE
+if test "$HOST" != "$BUILD"; then
+if test ${DISTRO} = "win32"; then
+echo "SET(CMAKE_SYSTEM_NAME Windows)" >> toolchain.cmake
+fi
+echo "SET(CMAKE_C_COMPILER ${CC})" >> toolchain.cmake
+echo "SET(CMAKE_CXX_COMPILER ${CXX})" >> toolchain.cmake
+echo "SET(CMAKE_FIND_ROOT_PATH  `pwd` )" >> toolchain.cmake
+echo "set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)" >> toolchain.cmake
+echo "set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)" >> toolchain.cmake
+echo "set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)" >> toolchain.cmake
+fi
+
 if wget --version >/dev/null 2>&1; then
     echo "WGET = `which wget` -c --passive" >> config.mak
 elif test -z `curl --version >/dev/null 2>&1`; then