parent
10eb3b4115
commit
e4c62bd902
|
@ -1,18 +1,26 @@
|
|||
diff --git a/wavefile/libsndfile.py b/wavefile/libsndfile.py
|
||||
index 67f0a46..ce066ee 100644
|
||||
index 89c670f..fa19e1d 100644
|
||||
--- a/wavefile/libsndfile.py
|
||||
+++ b/wavefile/libsndfile.py
|
||||
@@ -19,11 +19,11 @@ import numpy as np
|
||||
if sys.platform == "win32":
|
||||
dllName = 'libsndfile-1'
|
||||
elif "linux" in sys.platform:
|
||||
- dllName = 'libsndfile.so.1'
|
||||
+ dllName = '@libsndfile@'
|
||||
elif "cygwin" in sys.platform:
|
||||
dllName = 'libsndfile-1.dll'
|
||||
elif "darwin" in sys.platform:
|
||||
- dllName = 'libsndfile.dylib'
|
||||
+ dllName = '@libsndfile@'
|
||||
else:
|
||||
dllName = 'libsndfile'
|
||||
@@ -17,20 +17,7 @@ import ctypes as ct
|
||||
import numpy as np
|
||||
|
||||
def _libfilename():
|
||||
- for system, libname in [
|
||||
- ('win32', 'libsndfile-1'),
|
||||
- ('cygwin', 'libsndfile-1.dll'),
|
||||
- ('darwin', 'libsndfile.dylib'),
|
||||
- ('linux', 'libsndfile.so.1'),
|
||||
- ('freebsd', 'libsndfile.so.1'),
|
||||
- ('', 'libsndfile'),
|
||||
- ]:
|
||||
- if system in sys.platform:
|
||||
- return libname
|
||||
- raise Exception(
|
||||
- 'No libsndfile dll name mapping for platform {}.'
|
||||
- .format(sys.platform)
|
||||
- )
|
||||
+ return "@libsndfile@"
|
||||
|
||||
dllName = _libfilename()
|
||||
_lib=None
|
||||
|
|
Loading…
Reference in New Issue