Skip to content

Commit 79f739f

Browse files
committed
upd controller_path to reflect changes to pyinstaller
patch bump
1 parent b45b2da commit 79f739f

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

pdm.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[project]
22
name = "nvda_voicemeeter"
3-
version = "0.6.2"
3+
version = "0.6.3"
44
description = "A Voicemeeter app compatible with NVDA"
55
authors = [
66
{ name = "onyx-and-iris", email = "code@onyxandiris.online" },
@@ -17,9 +17,6 @@ readme = "README.md"
1717
text = "MIT"
1818

1919
[tool.pdm.dev-dependencies]
20-
build = [
21-
"pyinstaller>=5.1",
22-
]
2320
lint = [
2421
"black>=23.7.0",
2522
"ruff>=0.0.291",
@@ -28,6 +25,9 @@ lint = [
2825
test = [
2926
"psgdemos>=1.12.1",
3027
]
28+
build = [
29+
"pyinstaller>=6.3.0",
30+
]
3131

3232
[tool.pdm.scripts.build]
3333
shell = "build.ps1"

src/nvda_voicemeeter/cdll.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
from .errors import NVDAVMError
77

8-
bits = 64 if ct.sizeof(ct.c_void_p) == 8 else 32
8+
BITS = 64 if ct.sizeof(ct.c_void_p) == 8 else 32
99

1010
if platform.system() != "Windows":
1111
raise NVDAVMError("Only Windows OS supported")
@@ -15,7 +15,7 @@
1515
None,
1616
(
1717
"SOFTWARE",
18-
"WOW6432Node" if bits == 64 else "",
18+
"WOW6432Node" if BITS == 64 else "",
1919
"Microsoft",
2020
"Windows",
2121
"CurrentVersion",
@@ -39,8 +39,8 @@ def get_nvdapath():
3939

4040
controller_path = Path(__file__).parents[2].resolve() / "controllerClient"
4141
if not controller_path.exists():
42-
controller_path = Path("controllerClient")
42+
controller_path = Path("_internal") / "controllerClient"
4343

44-
DLL_PATH = controller_path / f"x{64 if bits == 64 else 86}" / f"nvdaControllerClient{bits}.dll"
44+
DLL_PATH = controller_path / f"x{64 if BITS == 64 else 86}" / f"nvdaControllerClient{BITS}.dll"
4545

4646
libc = ct.CDLL(str(DLL_PATH))

0 commit comments

Comments
 (0)