aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTristan Gingold <tgingold@free.fr>2023-01-17 18:26:24 +0100
committerTristan Gingold <tgingold@free.fr>2023-01-17 18:26:24 +0100
commit0574c562f9b1152e1077323f1bd8e57c2afda544 (patch)
tree0c77f8ee773556f8d173a41e1cd515e4d0b51838
parent4514e2ed4abb166c932ac22b77968515e6fc3249 (diff)
downloadghdl-0574c562f9b1152e1077323f1bd8e57c2afda544.tar.gz
ghdl-0574c562f9b1152e1077323f1bd8e57c2afda544.tar.bz2
ghdl-0574c562f9b1152e1077323f1bd8e57c2afda544.zip
standalone pyGHDL: put libraries in lib (instead of bin)
-rw-r--r--.github/workflows/Test.yml2
-rw-r--r--pyGHDL/libghdl/__init__.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml
index 03e8935de..3479353a0 100644
--- a/.github/workflows/Test.yml
+++ b/.github/workflows/Test.yml
@@ -421,7 +421,7 @@ jobs:
_zipdir='${{ matrix.sys }}-mcode-standalone'
mkdir -p "${_zipdir}"-extract
tar xf artifact/mingw-w64-*-ghdl-mcode-*.zst -C "${_zipdir}"-extract
- cd "${_zipdir}-extract/${{ matrix.sys }}"/bin
+ cd "${_zipdir}-extract/${{ matrix.sys }}"/lib
../../../scripts/msys2-mcode/GetStandaloneDeps.sh
cd ../../..
mv "${_zipdir}"-extract/${{ matrix.sys }} "${_zipdir}"
diff --git a/pyGHDL/libghdl/__init__.py b/pyGHDL/libghdl/__init__.py
index 2be39d1d6..b6516abb8 100644
--- a/pyGHDL/libghdl/__init__.py
+++ b/pyGHDL/libghdl/__init__.py
@@ -164,7 +164,7 @@ def _initialize():
if sys_platform == "win32" and sys_version_info.major == 3 and sys_version_info.minor >= 8:
from os import add_dll_directory as os_add_dll_directory
- p1 = _libghdl_path.parent.parent / "bin"
+ p1 = _libghdl_path.parent.parent / "lib"
os_add_dll_directory(str(p1))
# Load libghdl shared object