videoportals.c: Add metacafe URL support.

[vlc] / extras / contrib / bootstrap

diff --git a/extras/contrib/bootstrap b/extras/contrib/bootstrap
index 62678cb7b327780cbc8e281ed47fdee00bd6d718..7fe6bf7a14d35660285fa501f70c783d449f77f4 100755 (executable)
--- a/extras/contrib/bootstrap
+++ b/extras/contrib/bootstrap
@@ -74,13 +74,13 @@ case $HOST in
 # 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
+           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.3.9.sdk" >> config.mak
+           echo "MACOSX_SDK = /Developer/SDKs/MacOSX10.4u.sdk" >> config.mak
            CFLAGS_TUNING=" -arch ppc -mtune=G4"
-           EXTRA_CFLAGS=" -D\${ENVP} -isysroot \${MACOSX_SDK}"
+           EXTRA_CFLAGS=" -D\${ENVP} -isysroot \${MACOSX_SDK} -mmacosx-version-min=\${SDK_TARGET}"
            EXTRA_LDFLAGS=" -isysroot \${MACOSX_SDK} -Wl,-syslibroot,\${MACOSX_SDK}"
            echo "PATH = /bin:/usr/bin:/usr/local/bin" >> config.mak
         cat src/Distributions/darwin.mak >> distro.mak
@@ -89,14 +89,40 @@ case $HOST in
            SDK_TARGET=10.4
            echo "SDK_TARGET = ${SDK_TARGET}" >> config.mak
            echo "HAVE_DARWIN_OS = 1" >> config.mak
+           echo "HAVE_DARWIN_OS_ON_INTEL = 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_CFLAGS=" -D\${ENVP} -isysroot \${MACOSX_SDK} -mmacosx-version-min=\${SDK_TARGET}"
            EXTRA_LDFLAGS=" -isysroot \${MACOSX_SDK} -Wl,-syslibroot,\${MACOSX_SDK}"
            echo "PATH = /bin:/usr/bin:/usr/local/bin" >> config.mak
         cat src/Distributions/darwin.mak >> distro.mak
         ;;
+    powerpc-apple-darwin9)
+           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=" -arch ppc -mtune=G4"
+#          EXTRA_CFLAGS=" -D\${ENVP} -isysroot \${MACOSX_SDK} -mmacosx-version-min=\${SDK_TARGET}"
+#          EXTRA_LDFLAGS=" -isysroot \${MACOSX_SDK} -Wl,-syslibroot,\${MACOSX_SDK}"
+           echo "PATH = /bin:/usr/bin:/usr/local/bin" >> config.mak
+        cat src/Distributions/darwin.mak >> distro.mak
+        ;;
+    i686-apple-darwin9)
+           SDK_TARGET=10.4
+           echo "SDK_TARGET = ${SDK_TARGET}" >> config.mak
+           echo "HAVE_DARWIN_OS = 1" >> config.mak
+           echo "HAVE_DARWIN_OS_ON_INTEL = 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} -mmacosx-version-min=\${SDK_TARGET}"
+#          EXTRA_LDFLAGS=" -isysroot \${MACOSX_SDK} -Wl,-syslibroot,\${MACOSX_SDK}"
+           echo "PATH = /bin:/usr/bin:/usr/local/bin" >> config.mak
+        cat src/Distributions/darwin.mak >> distro.mak
+        ;;
     i586-pc-beos)
             echo "HAVE_BEOS = 1" >> config.mak
             if test -f /boot/beos/system/lib/libbind.so; then
@@ -177,7 +203,7 @@ echo "LD = ${LD}" >> config.mak
 echo "RANLIB = ${RANLIB}" >> config.mak
 echo "AR = ${AR}" >> config.mak
 echo "EXTRA_CFLAGS = ${CFLAGS_TUNING} ${EXTRA_CFLAGS}" >> config.mak
-echo "EXTRA_CPPFLAGS = ${EXTRA_CPPFLAGS} -I${PREFIX}/include" >> config.mak
+echo "EXTRA_CPPFLAGS = ${EXTRA_CPPFLAGS} -isystem \$(PREFIX)/include" >> config.mak
 echo "EXTRA_LDFLAGS = ${EXTRA_LDFLAGS}" >> config.mak
 echo "EXTRA_PATH = ${EXTRA_PATH}" >> config.mak