Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

[Bug] Fixed a bug in Windows DLL loading

Browse Source
This commit is contained in:
Li Fanxi 2010-12-22 00:02:35 +08:00
parent e7c2c28e6f
commit 948afa01e3
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/calibre/devices/bambook/libbambookcore.py
View File

@ -18,19 +18,17 @@ try:
cdll = ctypes.cdll cdll = ctypes.cdll
if iswindows: if iswindows:
_lib_name = 'BambookCore' _lib_name = 'BambookCore'
cdll = ctypes.windll if hasattr(sys, 'frozen') and iswindows:
lp = os.path.join(os.path.dirname(sys.executable), 'DLLs', 'BambookCore.dll')
lib_handle = cdll.LoadLibrary(lp)
elif hasattr(sys, 'frozen_path'):
lp = os.path.join(sys.frozen_path, 'lib', 'libBambookCore.so')
lib_handle = cdll.LoadLibrary(lp)
else: else:
if hasattr(sys, 'frozen') and iswindows: lib_handle = load_library(_lib_name, cdll)
lp = os.path.join(os.path.dirname(sys.executable), 'DLLs', 'BambookCore.dll')
lib_handle = cdll.LoadLibrary(lp)
elif hasattr(sys, 'frozen_path'):
lp = os.path.join(sys.frozen_path, 'lib', 'libBambookCore.so')
lib_handle = cdll.LoadLibrary(lp)
else:
lib_handle = load_library(_lib_name, cdll)
except: except:
lib_handle = None lib_handle = None
if iswindows: if iswindows:
text_encoding = 'mbcs' text_encoding = 'mbcs'
elif islinux: elif islinux: