[vlc-commits] commit: contribs: fix libvpx build, only specify cross prefix for win32 ( Rafaël Carré )
git at videolan.org
git at videolan.org
Sun Oct 31 21:02:49 CET 2010
vlc | branch: master | Rafaël Carré <rafael.carre at gmail.com> | Sun Oct 31 21:02:16 2010 +0100| [514d6aa6df0e0a9563385f3ba39c699fb55095e5] | committer: Rafaël Carré
contribs: fix libvpx build, only specify cross prefix for win32
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=514d6aa6df0e0a9563385f3ba39c699fb55095e5
---
extras/contrib/src/contrib-src.mak | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/extras/contrib/src/contrib-src.mak b/extras/contrib/src/contrib-src.mak
index 55e331d..3083322 100644
--- a/extras/contrib/src/contrib-src.mak
+++ b/extras/contrib/src/contrib-src.mak
@@ -955,7 +955,7 @@ libvpx:
ifdef HAVE_WIN32
VPX_TARGET=x86-win32-gcc
-CROSS=
+CROSS=$(HOST)-
else
ifdef HAVE_DARWIN_OS
ifdef HAVE_DARWIN_64
@@ -973,7 +973,7 @@ endif
endif
.libvpx: libvpx
- (cd $<; CROSS=$(HOST)- ./configure --target=$(VPX_TARGET) --disable-install-bins --disable-install-srcs --disable-install-libs --disable-examples && make && make install)
+ (cd $<; CROSS=$(CROSS) ./configure --target=$(VPX_TARGET) --disable-install-bins --disable-install-srcs --disable-install-libs --disable-examples && make && make install)
(rm -rf $(PREFIX)/include/vpx/ && mkdir $(PREFIX)/include/vpx/; cd $< && cp vpx/*.h vpx_ports/*.h $(PREFIX)/include/vpx/) # Of course, why the hell would one expect it to be listed or in make install?
rm $(PREFIX)/include/vpx/config.h
(cd $<; $(RANLIB) libvpx.a && mkdir -p $(PREFIX)/lib && cp libvpx.a $(PREFIX)/lib/) # Of course, why the hell would one expect it to be listed or in make install?
More information about the vlc-commits
mailing list