electrum

commit 61fc00fb9ec18faf6039f9da374722e1d4f487aa
parent 34d652b0f6445bde32a9f963f7f323476fd5630d
Author: ThomasV <thomasv@electrum.org>
Date:   Sat, 14 Dec 2019 10:51:13 +0100

Merge pull request #5840 from SomberNight/201912_py38_win_dlls_source

windows: when running from source, with py3.8+, load DLLs from '.dlls'
Diffstat:
M
.gitignore
 | 
1
+
M
run_electrum
 | 
7
+++++++

2 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/.gitignore b/.gitignore
@@ -16,6 +16,7 @@ bin/
 .idea
 .mypy_cache
 .vscode
+.dlls
 
 # icons
 electrum/gui/kivy/theming/light-0.png
diff --git a/run_electrum b/run_electrum
@@ -51,6 +51,13 @@ 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
+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)
+
 
 def check_imports():
     # pure-python dependencies need to be imported here for pyinstaller