[vlc-devel] commit: Revert "macosx/framework: Support multiple architectures." ( Rafaël Carré )

[git version control]

vlc | branch: master | Rafaël Carré <rafael.carre at gmail.com> | Mon Jan  4 13:28:36 2010 +0100| [a3bcd2df4f6ac2825d5b02e407d3258800a8b899] | committer: Rafaël Carré 

Revert "macosx/framework: Support multiple architectures."

This reverts commit 5a20b90e8c6920a79d7d7b7ca56fb011b97dfc73.

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

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

diff --git a/projects/macosx/framework/Configure.sh b/projects/macosx/framework/Configure.sh
index 482e0a6..433b9ae 100644
--- a/projects/macosx/framework/Configure.sh
+++ b/projects/macosx/framework/Configure.sh
@@ -48,6 +48,7 @@ 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"
@@ -70,28 +71,12 @@ else
 	args="--enable-release $args"
 fi
 
-archcount=0
-
 # 64 bits switches
-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"
+if test $ARCHS = "x86_64"
+then
+	args="--build=x86_64-apple-darwin10 $args"
 fi
 
-echo "Running [$archs_args] configure $args"
+echo "Running configure $args"
 top_srcdir="$SRCROOT/../../.."
-CFLAGS="$archs_args" CXXFLAGS="$archs_args" OBJCFLAGS="$archs_args" exec $top_srcdir/configure $args
\ No newline at end of file
+CFLAGS="-arch $ARCHS" CXXFLAGS="-arch $ARCHS" CPPFLAGS="-arch $ARCHS" OBJCFLAGS="-arch $ARCHS" exec $top_srcdir/configure $args