[vlc-commits] Contribs: update to latest x264 configure and use native win32 threads
Jean-Baptiste Kempf
git at videolan.org
Tue Jun 7 23:36:12 CEST 2011
vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue Jun 7 23:22:33 2011 +0200| [b0be5abef7c44cc8d1f8f8d1a0772b126fd0305b] | committer: Jean-Baptiste Kempf
Contribs: update to latest x264 configure and use native win32 threads
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b0be5abef7c44cc8d1f8f8d1a0772b126fd0305b
---
extras/contrib/src/contrib-src.mak | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/extras/contrib/src/contrib-src.mak b/extras/contrib/src/contrib-src.mak
index 0fc8144..a8d506a 100644
--- a/extras/contrib/src/contrib-src.mak
+++ b/extras/contrib/src/contrib-src.mak
@@ -1441,7 +1441,7 @@ ifdef HAVE_LINUX
X264CONF += --enable-pic
endif
-X264CONF += --disable-avs --disable-lavf --disable-ffms
+X264CONF += --disable-avs --disable-lavf --disable-ffms --enable-static
x264-$(X264_VERSION).tar.gz:
$(WGET) $(X264_URL)
@@ -1460,12 +1460,8 @@ x264:
endif
ifdef HAVE_WIN32
-.x264: x264 .pthreads
- ifdef HAVE_CYGWIN
- (cd $<; $(HOSTCC) RANLIB="ranlib" AR="ar" STRIP="strip" ./configure $(X264CONF) --prefix="$(PREFIX)" --extra-cflags="-I$(PREFIX)/include" --extra-ldflags="-L$(PREFIX)/lib" && make && make install)
- else
- (cd $<; $(HOSTCC) ./configure $(X264CONF) --prefix="$(PREFIX)" && make && make install)
- endif
+.x264: x264
+ (cd $<; $(HOSTCC) ./configure $(X264CONF) --prefix="$(PREFIX)" --enable-win32thread && make && make install)
else
ifdef HAVE_MACOSX_ON_INTEL
.x264: x264 .yasm
More information about the vlc-commits
mailing list