Skip to content

Commit ab6677a

Browse files
committed
.
1 parent 6e5dab9 commit ab6677a

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

scripts/dobuild.py

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ def __parsefile(fn, cb):
8686
shell=True,
8787
)
8888
subprocess.run(
89-
f"cmake --build ./ --config Release --target ALL_BUILD -j {os.cpu_count()}",
89+
f"cmake --build ./ --config Release -j {os.cpu_count()}",
9090
shell=True,
9191
)
9292
if binding.lower().startswith("pyqt"):
@@ -100,7 +100,14 @@ def __parsefile(fn, cb):
100100
f'python gen_pyi_from_sip.py {int(qtversion.startswith("5"))}', shell=True
101101
)
102102
subprocess.run(f"{pyPath} sip_code_fix.py", shell=True)
103-
103+
if sys.platform == "win32":
104+
__parsefile(
105+
"pyproject.toml",
106+
lambda c: c.replace(
107+
'[ "ElaWidgetTools" ]',
108+
'[ "ElaWidgetTools","D3D11", "DXGI", "kernel32" ,"user32", "gdi32", "winspool" ,"comdlg32", "advapi32", "shell32", "ole32", "oleaut32", "uuid", "odbc32", "odbccp32"]',
109+
),
110+
)
104111
subprocess.run(f"{sipbuild} --verbose --qmake {qmake}", shell=True)
105112
# for _dir, _, _fs in os.walk(r"."):
106113
# for _f in _fs:
@@ -141,7 +148,7 @@ def __parsefile(fn, cb):
141148
shell=True,
142149
)
143150
subprocess.run(
144-
f"cmake --build ./ --config Release --target ALL_BUILD -j {os.cpu_count()}",
151+
f"cmake --build ./ --config Release -j {os.cpu_count()}",
145152
shell=True,
146153
)
147154

scripts/pyqt/pyproject.toml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,4 @@ qmake-QT = ["widgets"]
2222
include-dirs = ["../../ElaWidgetTools/ElaWidgetTools"]
2323
sip-file = "ElaWidgetTools.sip"
2424
library-dirs = [ "../ElaWidgetTools/Release" ]
25-
libraries = [
26-
"ElaWidgetTools",
27-
"D3D11", "DXGI", "kernel32" ,"user32", "gdi32", "winspool" ,"comdlg32", "advapi32", "shell32", "ole32", "oleaut32", "uuid", "odbc32", "odbccp32"
28-
]
25+
libraries = [ "ElaWidgetTools" ]

0 commit comments

Comments
 (0)