@@ -38,16 +38,18 @@ class LibModuleMissing(Exception): pass
38
38
39
39
def load_library ():
40
40
if sys .platform == 'darwin' :
41
- library_paths = (os .path .join (os .path .dirname (__file__ ), 'libsecp256k1.0.dylib' ),
42
- 'libsecp256k1.0.dylib' )
41
+ libnames = ['libsecp256k1.1.dylib' , 'libsecp256k1.0.dylib' , ]
43
42
elif sys .platform in ('windows' , 'win32' ):
44
- library_paths = (os .path .join (os .path .dirname (__file__ ), 'libsecp256k1-0.dll' ),
45
- 'libsecp256k1-0.dll' )
43
+ libnames = ['libsecp256k1-1.dll' , 'libsecp256k1-0.dll' , ]
46
44
elif 'ANDROID_DATA' in os .environ :
47
- library_paths = ( 'libsecp256k1.so' ,)
45
+ libnames = [ 'libsecp256k1.so' , ]
48
46
else : # desktop Linux and similar
49
- library_paths = (os .path .join (os .path .dirname (__file__ ), 'libsecp256k1.so.0' ),
50
- 'libsecp256k1.so.0' , 'libsecp256k1.so.1' )
47
+ libnames = ['libsecp256k1.so.1' , 'libsecp256k1.so.0' , ]
48
+ library_paths = []
49
+ for libname in libnames : # try local files in repo dir first
50
+ library_paths .append (os .path .join (os .path .dirname (__file__ ), libname ))
51
+ for libname in libnames :
52
+ library_paths .append (libname )
51
53
52
54
exceptions = []
53
55
secp256k1 = None
0 commit comments