]> granicus.if.org Git - handbrake/commitdiff
contrib: Re-enable multithreading for libvpx.
authorBradley Sepos <bradley@bradleysepos.com>
Thu, 7 Jul 2016 18:19:02 +0000 (14:19 -0400)
committerBradley Sepos <bradley@bradleysepos.com>
Thu, 7 Jul 2016 18:19:02 +0000 (14:19 -0400)
contrib/libvpx/module.defs

index 333d45ee53a969661f5e535ed49e6a80d117ea5e..683cd17d01fb8f17617df61969214a624bff7205 100644 (file)
@@ -1,4 +1,10 @@
-$(eval $(call import.MODULE.defs,LIBVPX,libvpx,YASM))
+__deps__ := YASM
+ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
+__deps__ += PTHREADW32
+endif
+
+
+$(eval $(call import.MODULE.defs,LIBVPX,libvpx,$(__deps__)))
 $(eval $(call import.CONTRIB.defs,LIBVPX))
 
 LIBVPX.FETCH.url =  http://download.handbrake.fr/contrib/libvpx-1.5.0.tar.bz2
@@ -21,7 +27,7 @@ LIBVPX.CONFIGURE.extra =  \
 ifeq (1,$(BUILD.cross))
     LIBVPX.CONFIGURE.env.CROSS  = CROSS="$(BUILD.spec)-"
     LIBVPX.CONFIGURE.args.build =
-    LIBVPX.CONFIGURE.extra += --disable-multithread
+    LIBVPX.CONFIGURE.extra += --enable-static-msvcrt
     ifeq (i686,$(BUILD.machine))
         LIBVPX.CONFIGURE.extra += --target=x86-win32-gcc
     else ifeq (x86_64,$(BUILD.machine))