diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-07-23 16:11:34 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-07-26 11:52:49 +0200 |
| commit | b607a42e43df747007b6e0c3663ac39eaa0b4742 (patch) | |
| tree | 8ae4e4cd3009880d5177eafdc816adb3578cb8bf | |
| parent | 95abcc7d18997c1391423d15506bf03ab20997e6 (diff) | |
Build with RtAudio 6.0.1.
| -rw-r--r-- | cscript | 2 | ||||
| -rw-r--r-- | platform/windows/wscript | 1 | ||||
| -rw-r--r-- | src/wx/wscript | 3 |
3 files changed, 2 insertions, 4 deletions
@@ -537,7 +537,7 @@ def dependencies(target, options): deps = [('libdcp', 'v1.9.12', {'c++17': target.platform == 'osx'})] deps.append(('libsub', 'v1.6.49')) deps.append(('leqm-nrt', '30dcaea1373ac62fba050e02ce5b0c1085797a23')) - deps.append(('rtaudio', 'f619b76')) + deps.append(('rtaudio', '3212c0803905b1ff457a8309aa9ceed8c80e9b4b')) # We get our OpenSSL libraries from the environment, but we # also need a patched openssl binary to make certificates. # This dependency is to get that binary, which is added into diff --git a/platform/windows/wscript b/platform/windows/wscript index fb235ecba..996d3b1e8 100644 --- a/platform/windows/wscript +++ b/platform/windows/wscript @@ -236,6 +236,7 @@ File "%cdist_deps%/bin/sub-1.0.dll" File "%cdist_deps%/bin/ffprobe.exe" File "%cdist_deps%/src/openssl/apps/openssl.exe" File "%cdist_deps%/bin/libopenjp2.dll" +File "%cdist_deps%/bin/librtaudio-7.dll" """, file=f) if debug: diff --git a/src/wx/wscript b/src/wx/wscript index 9471b9acd..dcd4adaf1 100644 --- a/src/wx/wscript +++ b/src/wx/wscript @@ -289,9 +289,6 @@ def configure(conf): # Some rtaudio-configs don't include rtaudio as a link library. Go figure. conf.env.LIB_RTAUDIO.append('rtaudio') if conf.env.TARGET_WINDOWS_64 or conf.env.TARGET_WINDOWS_32: - # 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') |