summaryrefslogtreecommitdiffstats
path: root/contrib/libvpx
diff options
context:
space:
mode:
authorBradley Sepos <[email protected]>2016-07-07 14:19:02 -0400
committerBradley Sepos <[email protected]>2016-07-07 14:19:02 -0400
commit4ccb032dd95e2a8f249dc503d90ee69815290bbe (patch)
tree4b718c0455afb7f6b86adf4aebfefdc5107e996a /contrib/libvpx
parentaed33295ece649a1547ea01204304a102d98c809 (diff)
contrib: Re-enable multithreading for libvpx.
Diffstat (limited to 'contrib/libvpx')
-rw-r--r--contrib/libvpx/module.defs10
1 files changed, 8 insertions, 2 deletions
diff --git a/contrib/libvpx/module.defs b/contrib/libvpx/module.defs
index 333d45ee5..683cd17d0 100644
--- a/contrib/libvpx/module.defs
+++ b/contrib/libvpx/module.defs
@@ -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))