[vlc-devel] commit: macosx/framework: Support multiple architectures. (Pierre d' Herbemont )

[git version control]

vlc | branch: master | Pierre d'Herbemont <pdherbemont at free.fr> | Thu Dec 31 20:36:00 2009 +0100| [5a20b90e8c6920a79d7d7b7ca56fb011b97dfc73] | committer: Pierre d'Herbemont 

macosx/framework: Support multiple architectures.

Warning, building fat are not supported by automake if dependency-tracking is enabled.
That's why this fat build is disabled by default.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5a20b90e8c6920a79d7d7b7ca56fb011b97dfc73
---

 projects/macosx/framework/Configure.sh |   27 +++++++++++++++++++++------
 1 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/projects/macosx/framework/Configure.sh b/projects/macosx/framework/Configure.sh
index 433b9ae..482e0a6 100644
--- a/projects/macosx/framework/Configure.sh
+++ b/projects/macosx/framework/Configure.sh
@@ -48,7 +48,6 @@ args="--disable-ncurses $args"
 args="--disable-httpd $args"
 args="--disable-vlm $args"
 args="--disable-skins2 $args"
-args="--disable-x11 $args"
 args="--disable-glx $args"
 args="--disable-xvideo $args"
 args="--disable-xcb $args"
@@ -71,12 +70,28 @@ else
 	args="--enable-release $args"
 fi
 
+archcount=0
+
 # 64 bits switches
-if test $ARCHS = "x86_64"
-then
-	args="--build=x86_64-apple-darwin10 $args"
+for a in $ARCHS; do
+	archs_args="-arch $a $archs_args"
+    let archcount=archcount+1
+done
+
+if test $archcount -ge 2; then
+    echo "****"
+    echo "WARNING: You are building a VLC with --disable-dependency-tracking"
+    echo "         because FAT architecture are not compatible with "
+    echo "         disable-dependency-tracking."
+    echo ""
+    echo "         You will have to do a clean build manually."
+    echo ""
+    echo "To disable this message, build only one architecture."
+    echo ""
+    echo "****"
+    args="--disable-dependency-tracking $args"
 fi
 
-echo "Running configure $args"
+echo "Running [$archs_args] configure $args"
 top_srcdir="$SRCROOT/../../.."
-CFLAGS="-arch $ARCHS" CXXFLAGS="-arch $ARCHS" CPPFLAGS="-arch $ARCHS" OBJCFLAGS="-arch $ARCHS" exec $top_srcdir/configure $args
+CFLAGS="$archs_args" CXXFLAGS="$archs_args" OBJCFLAGS="$archs_args" exec $top_srcdir/configure $args
\ No newline at end of file