[vlc-devel] commit: contribs: assume x86_64 for Darwin 10 ( Felix Paul Kühne )

[git version control]

vlc | branch: 1.0-bugfix | Felix Paul Kühne <fkuehne at videolan.org> | Mon Jun 15 14:26:10 2009 +0200| [992bac8dbe35723ffd18e183315cb0ad5bcd6cce] | committer: Felix Paul Kühne 

contribs: assume x86_64 for Darwin 10

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

 extras/contrib/src/Makefile |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 22ed470..be6263e 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -156,6 +156,15 @@ endif
 ifdef HAVE_DARWIN_OS_ON_INTEL
 FFMPEG_CFLAGS += -DHAVE_LRINTF
 endif
+ifndef HAVE_DARWIN_10
+NONLLVMCC+= CC="/Developer/usr/bin/gcc-4.2"
+NONLLVMCC+= CXX="/Developer/usr/bin/g++-4.2"
+else
+X264CONF+=--host=x86_64-apple-darwin10
+NONLLVMCC+= $(HOSTCC)
+endif
+else
+NONLLVMCC+= $(HOSTCC)
 endif
 
 ifdef HAVE_AMR