[vlc-commits] commit: contrib: Don't assume DARWIN_OS is Mac OS X. (Pierre d'Herbemont )

[git at videolan.org]

vlc | branch: master | Pierre d'Herbemont <pdherbemont at free.fr> | Tue Nov  2 21:52:29 2010 +0100| [bc28b885be9b7506510d3b3ef633f47f75dcf915] | committer: Pierre d'Herbemont 

contrib: Don't assume DARWIN_OS is Mac OS X.

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

 extras/contrib/src/contrib-src.mak |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/extras/contrib/src/contrib-src.mak b/extras/contrib/src/contrib-src.mak
index 8323a38..ecd534c 100644
--- a/extras/contrib/src/contrib-src.mak
+++ b/extras/contrib/src/contrib-src.mak
@@ -155,14 +155,15 @@ endif
 ifdef HAVE_DARWIN_OS
 X264CONF=--host=$(HOST)
 X264CONF += --enable-pic
-FFMPEGCONF += --enable-libvpx
 ifdef HAVE_DARWIN_32
+FFMPEGCONF += --enable-libvpx
 FFMPEGCONF += --cc=gcc-4.0
 else
 FFMPEGCONF += --cc=$(CC)
 endif
 FFMPEGCONF += --arch=$(ARCH)
 ifdef HAVE_DARWIN_64
+FFMPEGCONF += --enable-libvpx
 FFMPEGCONF += --cpu=core2
 X264CONF+=--host=x86_64-apple-darwin10
 endif