diff --git a/setup.py b/setup.py index 9d485f9..7f9cfb0 100644 --- a/setup.py +++ b/setup.py @@ -23,6 +23,7 @@ libname = 'libportaudio.dylib' elif system == 'Windows': libname = 'libportaudio' + architecture0 + '.dll' + libname_asio = 'libportaudio' + architecture0 + '-asio.dll' else: libname = None @@ -30,6 +31,9 @@ packages = ['_sounddevice_data'] package_data = {'_sounddevice_data': ['portaudio-binaries/' + libname, 'portaudio-binaries/README.md']} + if system == 'Windows': + package_data['_sounddevice_data'].append( + 'portaudio-binaries/' + libname_asio) zip_safe = False else: packages = None diff --git a/sounddevice.py b/sounddevice.py index 18f7d1d..85144e9 100644 --- a/sounddevice.py +++ b/sounddevice.py @@ -74,7 +74,10 @@ if _platform.system() == 'Darwin': _libname = 'libportaudio.dylib' elif _platform.system() == 'Windows': - _libname = 'libportaudio' + _platform.architecture()[0] + '.dll' + if 'SD_ENABLE_ASIO' in _os.environ: + _libname = 'libportaudio' + _platform.architecture()[0] + '-asio.dll' + else: + _libname = 'libportaudio' + _platform.architecture()[0] + '.dll' else: raise import _sounddevice_data