From ea1d2649efa70b7f54cb3ae2442cc9ca7896e262 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 15 Apr 2019 14:12:35 +0100 Subject: Bump rtaudio to git head (with some patches of mine) in order to get WASAPI fixes. --- cscript | 2 +- src/wx/wscript | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cscript b/cscript index 870cdb39e..da71546d2 100644 --- a/cscript +++ b/cscript @@ -352,7 +352,7 @@ def dependencies(target): deps.append(('libdcp', 'v1.6.6')) deps.append(('libsub', 'v1.4.6')) - deps.append(('rtaudio-cdist', 'aad62d7')) + deps.append(('rtaudio-cdist', '0dbc732')) return deps diff --git a/src/wx/wscript b/src/wx/wscript index 47c9d1b3e..538e7da0e 100644 --- a/src/wx/wscript +++ b/src/wx/wscript @@ -219,10 +219,14 @@ def configure(conf): # Some rtaudio-configs don't include rtaudio as a link library. Go figure. conf.env.LIB_RTAUDIO.append('rtaudio') - # Don't explicitly link with pthread on Windows if conf.env.TARGET_WINDOWS: + # Don't explicitly link with pthread on Windows conf.env.CFLAGS_RTAUDIO.remove('-pthread') conf.env.LINKFLAGS_RTAUDIO.remove('-pthread') + # We need some libraries for WASAPI + conf.env.LIB_RTAUDIO.append('mfplat') + conf.env.LIB_RTAUDIO.append('mfuuid') + conf.env.LIB_RTAUDIO.append('wmcodecdspuuid') conf.check_cxx(fragment=""" #include \n -- cgit v1.2.3