Merge branch 'master' into noglib

This commit is contained in:
me 2016-12-24 13:21:53 +08:00
commit 1d85d1763d

View file

@ -61,7 +61,7 @@ def _load_lib(path):
if sys.platform in ('win32', 'cygwin'): if sys.platform in ('win32', 'cygwin'):
_load_win_support(path) _load_win_support(path)
lib_file = os.path.join(path, _lib[sys.platform]) lib_file = os.path.join(path, _lib.get(sys.platform, 'libunicorn.so'))
#print('Trying to load shared library', lib_file) #print('Trying to load shared library', lib_file)
dll = ctypes.cdll.LoadLibrary(lib_file) dll = ctypes.cdll.LoadLibrary(lib_file)
#print('SUCCESS') #print('SUCCESS')