diff options
| -rw-r--r-- | build_scripts/platforms/windows_desktop.py | 29 | ||||
| -rw-r--r-- | build_scripts/wheel_files.py | 3 |
2 files changed, 17 insertions, 15 deletions
diff --git a/build_scripts/platforms/windows_desktop.py b/build_scripts/platforms/windows_desktop.py index 8045ae56e..adf4a069e 100644 --- a/build_scripts/platforms/windows_desktop.py +++ b/build_scripts/platforms/windows_desktop.py @@ -200,26 +200,27 @@ def prepare_packages_win32(pyside_build, _vars): copy_msvc_redist_files(destination_dir) +# MSVC redistributable file list. +msvc_redist = [ + "concrt140.dll", + "msvcp140.dll", + "vcamp140.dll", + "vccorlib140.dll", + "vcomp140.dll", + "vcruntime140.dll", + "vcruntime140_1.dll", + "msvcp140_1.dll", + "msvcp140_2.dll", + "msvcp140_codecvt_ids.dll" +] + + def copy_msvc_redist_files(destination_dir): in_coin = os.environ.get('COIN_LAUNCH_PARAMETERS', None) if in_coin is None: print("Qt dependency DLLs (MSVC redist) will not be copied.") return - # MSVC redistributable file list. - msvc_redist = [ - "concrt140.dll", - "msvcp140.dll", - "vcamp140.dll", - "vccorlib140.dll", - "vcomp140.dll", - "vcruntime140.dll", - "vcruntime140_1.dll", - "msvcp140_1.dll", - "msvcp140_2.dll", - "msvcp140_codecvt_ids.dll" - ] - # Make a directory where the files should be extracted. if not destination_dir.exists(): destination_dir.mkdir(parents=True) diff --git a/build_scripts/wheel_files.py b/build_scripts/wheel_files.py index 9c7caf5c4..b8caf32ab 100644 --- a/build_scripts/wheel_files.py +++ b/build_scripts/wheel_files.py @@ -214,9 +214,10 @@ def module_QtCore() -> ModuleData: data.extra_files.append("qt.conf") data.extra_files.append("rcc.exe") data.extra_files.append("qtdiag.exe") - data.extra_files.append("d3dcompiler*") data.extra_files.append("pyside6.*.lib") data.extra_files.append("resources/icudtl.dat") + from build_scripts.platforms.windows_desktop import msvc_redist + data.extra_files.extend(msvc_redist) else: data.lib.append("libpyside6.*") if sys.platform == "darwin": |