* patch libtwolame and re-enable x264 as it was fixed upstream. all contribs are...

[vlc] / extras / contrib / bootstrap

diff --git a/extras/contrib/bootstrap b/extras/contrib/bootstrap
index f9a644352087fe4afcd6447aac6a265b38b8ede1..60480f2adb57d06f1d48df98491f719ac22064b4 100755 (executable)
--- a/extras/contrib/bootstrap
+++ b/extras/contrib/bootstrap
@@ -2,7 +2,7 @@
 # ***************************************************************************
 # bootstrap : Set up config.mak
 # ***************************************************************************
-# Copyright (C) 2003 the VideoLAN team
+# Copyright (C) 2003-2006 the VideoLAN team
 # $Id$
 #
 # Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -19,7 +19,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
 # ***************************************************************************
 
 if test "$#" -gt "1"; then
@@ -41,12 +41,10 @@ else
 fi
 
 rm -f config.mak
-echo -e "# Automatically generated by bootstrap.\n# Make changes if you know what you're doing.\n" > config.mak
-
-echo "BUILD = $BUILD" >> config.mak
-echo "HOST = $HOST" >> config.mak
-
-echo "PREFIX = `pwd`" >> config.mak
+{
+       echo "# Automatically generated by bootstrap."
+       echo "# Make changes if you know what you're doing."
+} > config.mak
 
 if test "$HOST" != "$BUILD"; then
     CC="${HOST}-gcc"
@@ -59,22 +57,35 @@ fi
 case $HOST in
     ppc-darwin)
 # Mac OS X < 10.4
-           echo "HAVE_DARWIN_OS = 1" >> config.mak
-           EXTRA_CPPFLAGS=" -no-cpp-precomp"
-           echo "PATH = /bin:/usr/bin" >> config.mak
+           echo "Your version of Mac OS X is too old!" >&2
+           echo "Compiling VLC requires 10.4.x or later" >&2
+           exit 1
        ;;
     powerpc-apple-darwin8)
 # Mac OS X 10.4
 # Makefile cross compiling is only supported with gcc-4.0
 # ENVP defines the oldest environment on which the program will be able to run
 # SDK 10.2.8 requires gcc-3.3 (so we cannot use that SDK)
+           SDK_TARGET=10.3
+           echo "SDK_TARGET = ${SDK_TARGET}" >> config.mak
            echo "HAVE_DARWIN_OS = 1" >> config.mak
-            echo "ENVP = MACOSX_DEPLOYMENT_TARGET=10.3" >> config.mak
-           echo "MACOSX_SDK = /Developer/SDKs/MacOSX10.3.0.sdk" >> config.mak
-#          EXTRA_CFLAGS=" -D\${ENVP} -isysroot \${MACOSX_SDK}"
-           EXTRA_CPPFLAGS=" -no-cpp-precomp"
-#          EXTRA_LDFLAGS=" -isysroot \${MACOSX_SDK} -Wl,-syslibroot,\${MACOSX_SDK}"
-           echo "PATH = /bin:/usr/bin" >> config.mak
+           echo "ENVP = MACOSX_DEPLOYMENT_TARGET=${SDK_TARGET}" >> config.mak
+           echo "MACOSX_SDK = /Developer/SDKs/MacOSX10.3.9.sdk" >> config.mak
+           CFLAGS_TUNING=" -mtune=G4"
+           EXTRA_CFLAGS=" -D\${ENVP} -isysroot \${MACOSX_SDK}"
+           EXTRA_LDFLAGS=" -isysroot \${MACOSX_SDK} -Wl,-syslibroot,\${MACOSX_SDK}"
+           echo "PATH = /bin:/usr/bin:/usr/local/bin" >> config.mak
+        ;;
+    i686-apple-darwin8)
+           SDK_TARGET=10.4
+           echo "SDK_TARGET = ${SDK_TARGET}" >> config.mak
+           echo "HAVE_DARWIN_OS = 1" >> config.mak
+           echo "ENVP = MACOSX_DEPLOYMENT_TARGET=${SDK_TARGET}" >> config.mak
+           echo "MACOSX_SDK = /Developer/SDKs/MacOSX10.4u.sdk" >> config.mak
+           CFLAGS_TUNING=" -march=pentium-m -mtune=prescott"
+           EXTRA_CFLAGS=" -D\${ENVP} -isysroot \${MACOSX_SDK}"
+           EXTRA_LDFLAGS=" -isysroot \${MACOSX_SDK} -Wl,-syslibroot,\${MACOSX_SDK}"
+           echo "PATH = /bin:/usr/bin:/usr/local/bin" >> config.mak
         ;;
     i586-pc-beos)
             echo "HAVE_BEOS = 1" >> config.mak
@@ -100,34 +111,41 @@ case $HOST in
                 echo "PATH = ${PATH}" >> config.mak
             fi
         ;;
-    i586-mingw32msvc)
+    *mingw32*)
             echo "HAVE_WIN32 = 1" >> config.mak
             echo "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig" >> config.mak
         ;;
     i686-pc-cygwin)
             echo "HAVE_WIN32 = 1" >> config.mak
-            CC="gcc -mno-cygwin"
-            CXX="g++ -mno-cygwin"
-            EXTRA_CFLAGS=" -mno-cygwin"
-            EXTRA_CPPFLAGS=" -mno-cygwin"
+            CC="gcc -mno-cygwin -isystem /usr/include/mingw"
+            CXX="g++ -mno-cygwin -isystem /usr/include/mingw"
+            HOST=`$CC -dumpmachine`
+            EXTRA_CFLAGS=" -mno-cygwin -isystem /usr/include/mingw"
+            EXTRA_CPPFLAGS=" -mno-cygwin -isystem /usr/include/mingw"
             EXTRA_LDFLAGS=" -mno-cygwin"
             echo "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig" >> config.mak
         ;;
     arm-wince-pe)
             echo "HAVE_WINCE = 1" >> config.mak
             echo "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig" >> config.mak
+            EXTRA_CPPFLAGS=" -D_WIN32_WCE"
         ;;
     *)
         ;;
 esac
 
+echo "BUILD = $BUILD" >> config.mak
+echo "HOST = $HOST" >> config.mak
+
+echo "PREFIX = `pwd`" >> config.mak
+
 echo "CC = ${CC}" >> config.mak
 echo "CXX = ${CXX}" >> config.mak
 echo "LD = ${LD}" >> config.mak
 echo "RANLIB = ${RANLIB}" >> config.mak
 echo "AR = ${AR}" >> config.mak
-echo "EXTRA_CFLAGS = ${EXTRA_CFLAGS}" >> config.mak
-echo "EXTRA_CPPFLAGS = ${EXTRA_CPPFLAGS}" >> config.mak
+echo "EXTRA_CFLAGS = ${CFLAGS_TUNING} ${EXTRA_CFLAGS}" >> config.mak
+echo "EXTRA_CPPFLAGS = ${EXTRA_CPPFLAGS} -I${PREFIX}/include" >> config.mak
 echo "EXTRA_LDFLAGS = ${EXTRA_LDFLAGS}" >> config.mak
 echo "EXTRA_PATH = ${EXTRA_PATH}" >> config.mak
 
@@ -144,6 +162,8 @@ if test -f /sw/bin/svn; then
         echo "SVN = /sw/bin/svn" >> config.mak
 elif test -f /usr/local/bin/svn; then
         echo "SVN = /usr/local/bin/svn" >> config.mak
+elif test -f /opt/local/bin/svn; then
+       echo "SVN = /opt/local/bin/svn" >> config.mak
 elif svn help >/dev/null 2>&1; then
         echo "SVN = svn" >> config.mak
 else