summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@centricular.com>2016-10-27 23:02:37 +0530
committerNirbheek Chauhan <nirbheek@centricular.com>2016-11-28 19:57:55 +0530
commit6df682c6f99653a6d1b0ead89fe414f514e279b3 (patch)
tree88d520fd981d46d7bb7316ec5d6c38d43479cf3c
parentef42288f3fc98ca28ac6e3627604c71448fd1cb0 (diff)
Revert "meson: dv plugin now works on MSVC"
This reverts commit 05a89613feff70cff416367f5aa807a1d5c68b63. Let's not put in stuff that needs unreleased Meson. This can go in for the next cycle.
-rw-r--r--ext/meson.build5
1 files changed, 4 insertions, 1 deletions
diff --git a/ext/meson.build b/ext/meson.build
index 6fef67c7c..d60e70b60 100644
--- a/ext/meson.build
+++ b/ext/meson.build
@@ -5,7 +5,10 @@ subdir('gdk_pixbuf')
subdir('jack')
subdir('jpeg')
# subdir('libcaca')
-subdir('dv')
+# FIXME: dv plugin fails to link with msvc, wants pthread.lib
+if cc.get_id() != 'msvc'
+ subdir('dv')
+endif
subdir('libpng')
# subdir('raw1394')
subdir('pulse')