twindows: when running from source, load DLLs from main dir - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 23a93ef7adeb9a5596fdf8904af4430176d536ef
DIR parent e8118e184523cdb513743eca04bcc6c707d40009
HTML Author: SomberNight <somber.night@protonmail.com>
Date: Tue, 11 Feb 2020 20:37:03 +0100
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)
Diffstat:
M .gitignore | 1 -
M run_electrum | 9 ++++-----
2 files changed, 4 insertions(+), 6 deletions(-)
---
DIR diff --git a/.gitignore b/.gitignore
t@@ -16,7 +16,6 @@ bin/
.idea
.mypy_cache
.vscode
-.dlls
# icons
electrum/gui/kivy/theming/light-0.png
DIR diff --git a/run_electrum b/run_electrum
t@@ -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():