From b0be5abef7c44cc8d1f8f8d1a0772b126fd0305b Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Kempf Date: Tue, 7 Jun 2011 23:22:33 +0200 Subject: [PATCH] Contribs: update to latest x264 configure and use native win32 threads --- extras/contrib/src/contrib-src.mak | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/extras/contrib/src/contrib-src.mak b/extras/contrib/src/contrib-src.mak index 0fc81449f6..a8d506ab23 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 -- 2.39.2