Browse Source

windows: when running from source, load DLLs from main dir

Load DLLs from inner 'electrum' dir instead of '.dlls'.
To make it consistent with where we expect libsecp256k1 (.dll/.so) be.
(note that while in case of libsecp we specifically already search the main dir,
without this change, other DLLs such as libusb or libzbar would not be found there)
master
SomberNight 6 years ago
parent
commit
23a93ef7ad
No known key found for this signature in database
GPG Key ID: B33B5F232C6271E9
  1. 1
      .gitignore
  2. 9
      run_electrum

1
.gitignore vendored

@ -16,7 +16,6 @@ bin/
.idea
.mypy_cache
.vscode
.dlls
# icons
electrum/gui/kivy/theming/light-0.png

9
run_electrum

@ -51,12 +51,11 @@ os.environ['KIVY_DATA_DIR'] = os.path.abspath(os.path.dirname(__file__)) + '/ele
if is_local or is_android:
sys.path.insert(0, os.path.join(script_dir, 'packages'))
# when running from source, on Windows, also search for DLLs in '.dlls' top-level folder
# when running from source, on Windows, also search for DLLs in inner 'electrum' folder
if is_local and os.name == 'nt':
dll_dir = os.path.join(os.path.dirname(__file__), '.dlls')
if os.path.exists(dll_dir):
if hasattr(os, 'add_dll_directory'): # requires python 3.8+
os.add_dll_directory(dll_dir)
dll_dir = os.path.join(os.path.dirname(__file__), 'electrum')
if hasattr(os, 'add_dll_directory'): # requires python 3.8+
os.add_dll_directory(dll_dir)
def check_imports():

Loading…
Cancel
Save