Browse Source
Merge pull request #5840 from SomberNight/201912_py38_win_dlls_source
windows: when running from source, with py3.8+, load DLLs from '.dlls'
hard-fail-on-bad-server-string
ThomasV
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
8 additions and
0 deletions
-
.gitignore
-
run_electrum
|
|
|
@ -16,6 +16,7 @@ bin/ |
|
|
|
.idea |
|
|
|
.mypy_cache |
|
|
|
.vscode |
|
|
|
.dlls |
|
|
|
|
|
|
|
# icons |
|
|
|
electrum/gui/kivy/theming/light-0.png |
|
|
|
|
|
|
|
@ -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 |
|
|
|
|
