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

diff --git a/extras/contrib/bootstrap b/extras/contrib/bootstrap
index 749541e229..ac39d96063 100755
--- a/extras/contrib/bootstrap
+++ b/extras/contrib/bootstrap
@@ -80,6 +80,9 @@ case $HOST in
     *86*)
           ARCH="i386"
      ;;
+    arm*eabi)
+          ARCH="armel"
+     ;;
 esac
 echo "ARCH = $ARCH" >> config.mak
 
@@ -162,6 +165,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
@@ -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,20 +188,24 @@ 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
         echo "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig" >> config.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
@@ -205,7 +215,7 @@ case $HOST in
     *mingw32*)
         echo "HAVE_WIN32 = 1" >> config.mak
         echo "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig" >> config.mak
-        EXTRA_CFLAGS="-O3"
+        EXTRA_CFLAGS=" -O3 -march=i686 -mtune=generic"
         DISTRO=win32
     ;;
     i686-pc-cygwin)
@@ -235,9 +245,8 @@ 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 -mfloat-abi=softfp"
+            EXTRA_CFLAGS="$EXTRA_CFLAGS -O3 -fno-tree-vectorize"
         else
             EXTRA_CFLAGS="-msoft-float"
         fi
@@ -281,7 +290,9 @@ 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
@@ -294,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