diff options
| author | Tristan Gingold <tgingold@free.fr> | 2023-01-17 19:16:27 +0100 |
|---|---|---|
| committer | Tristan Gingold <tgingold@free.fr> | 2023-01-17 19:16:27 +0100 |
| commit | 1b0c3819af5eb1f481db51e4dbdfd7e00757ddaf (patch) | |
| tree | a7b7607cbf150213350652ec18331ba4719524a6 | |
| parent | e40d6459af3d275ca8329ec5a03ff0113d54a3d9 (diff) | |
| download | ghdl-1b0c3819af5eb1f481db51e4dbdfd7e00757ddaf.tar.gz ghdl-1b0c3819af5eb1f481db51e4dbdfd7e00757ddaf.tar.bz2 ghdl-1b0c3819af5eb1f481db51e4dbdfd7e00757ddaf.zip | |
Revert "standalone pyGHDL: put libraries in lib (instead of bin)"
This reverts commit 0574c562f9b1152e1077323f1bd8e57c2afda544.
| -rw-r--r-- | .github/workflows/Test.yml | 2 | ||||
| -rw-r--r-- | pyGHDL/libghdl/__init__.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml index 3479353a0..03e8935de 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 }}"/lib + cd "${_zipdir}-extract/${{ matrix.sys }}"/bin ../../../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 b6516abb8..2be39d1d6 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 / "lib" + p1 = _libghdl_path.parent.parent / "bin" os_add_dll_directory(str(p1)) # Load libghdl shared object |