Contribs: update to latest x264 configure and use native win32 threads

diff --git a/extras/contrib/src/contrib-src.mak b/extras/contrib/src/contrib-src.mak
index 0fc81449f606e03d6dacb1a93e4f88e307c085b0..a8d506ab23e9c7c8d76ced91b93f77bb8806a7be 100644 (file)
--- 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