summaryrefslogtreecommitdiffstats
path: root/wscript
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-09-14 16:21:04 +0200
committerwm4 <wm4@nowhere>2014-09-14 16:24:01 +0200
commite0b4daf3ad240ecf70af73c13b6ca9b1062a507f (patch)
treee52d79650aa69c0288dd5d9c896ab943c692f88f /wscript
parentb44571ababeb368e94df6665c1d370d817a51135 (diff)
downloadmpv-e0b4daf3ad240ecf70af73c13b6ca9b1062a507f.tar.bz2
mpv-e0b4daf3ad240ecf70af73c13b6ca9b1062a507f.tar.xz
input: use libwaio for pipe input on Windows
Use libwaio to read from pipes (stdin or named pipes) on Windows. This liberates us from nasty issues, such as pipes (as created by most programs) not being possible to read in a non-blocking or event-driven way. Although it would be possible to do that in a somewhat sane way on Vista+, it's still not easy, and on XP it's especially hard. libwaio handles these things for us. Move pipe.c to pipe-unix.c, and remove Windows specific things. Also adjust the input.c code to make this work cleanly.
Diffstat (limited to 'wscript')
-rw-r--r--wscript11
1 files changed, 11 insertions, 0 deletions
diff --git a/wscript b/wscript
index 586f2cddf0..ccf594e32f 100644
--- a/wscript
+++ b/wscript
@@ -104,6 +104,11 @@ main_dependencies = [
'desc': 'mman.h',
'func': check_statement('sys/mman.h', 'mmap(0, 0, 0, 0, 0, 0)')
}, {
+ 'name': 'mingw',
+ 'desc': 'MinGW',
+ 'deps': [ 'os-win32' ],
+ 'func': check_statement('stddef.h', 'int x = __MINGW32__')
+ }, {
'name': 'pthreads',
'desc': 'POSIX threads',
'func': check_pthreads,
@@ -160,6 +165,12 @@ iconv support use --disable-iconv.",
'deps_any': [ 'os-win32', 'os-cygwin'],
'func': check_true
}, {
+ 'name': '--waio',
+ 'desc': 'libwaio for win32',
+ 'deps': [ 'os-win32', 'mingw' ],
+ 'func': check_libs(['waio'],
+ check_statement('waio/waio.h', 'waio_alloc(0, 0, 0, 0)')),
+ }, {
'name': 'videoio',
'desc': 'videoio.h',
'func': check_headers('sys/videoio.h')