summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2019-04-15 14:12:35 +0100
committerCarl Hetherington <cth@carlh.net>2019-04-15 22:31:33 +0100
commitea1d2649efa70b7f54cb3ae2442cc9ca7896e262 (patch)
treec7b670faa03020047a93b639ee747f129c3dd520
parentb8cd038b2f5e6d521b3593c4f6024bf1cd287670 (diff)
Bump rtaudio to git head (with some patches of mine)
in order to get WASAPI fixes.
-rw-r--r--cscript2
-rw-r--r--src/wx/wscript6
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 <RtAudio.h>\n