[vlc-commits] commit: fix [41373a85a2] ( Rafaël Carré )

git at videolan.org git at videolan.org
Thu Nov 18 19:19:32 CET 2010


vlc | branch: master | Rafaël Carré <rafael.carre at gmail.com> | Thu Nov 18 19:19:09 2010 +0100| [2f53024169a244b6ab9e6b20b5f71a2683634071] | committer: Rafaël Carré 

fix [41373a85a2]

We don't want an universal build on osx

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

 extras/contrib/src/contrib-src.mak |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/extras/contrib/src/contrib-src.mak b/extras/contrib/src/contrib-src.mak
index f30a52c..161e7ec 100644
--- a/extras/contrib/src/contrib-src.mak
+++ b/extras/contrib/src/contrib-src.mak
@@ -877,10 +877,12 @@ ifdef HAVE_WIN32
 CROSS=$(HOST)-
 endif
 
-VPX_TARGET-$(ENABLED)             = $(TARGET)
-VPX_TARGET-$(HAVE_WIN32)          = x86-win32-gcc
-
-VPX_DEPS-$(ENABLED)               =
+VPX_TARGET-$(ENABLED)              = FIXME
+VPX_TARGET-$(HAVE_WIN32)           = x86-win32-gcc
+VPX_TARGET-$(HAVE_DARWIN_OS)       = ppc32-darwin9-gcc
+VPX_TARGET-$(HAVE_MACOSX_ON_INTEL) = x86-darwin9-gcc
+VPX_TARGET-$(HAVE_MACOSX64)        = x86_64-darwin9-gcc
+VPX_DEPS-$(ENABLED)                =
 VPX_DEPS-$(HAVE_MACOSX_ON_INTEL) += .yasm
 
 .libvpx: libvpx $(VPX_DEPS-1)



More information about the vlc-commits mailing list