From 745e6e08d6d43a67bb53c30fc1f1dd30cb5ab3db Mon Sep 17 00:00:00 2001 From: doyle Date: Fri, 15 Jul 2022 00:36:00 +1000 Subject: [PATCH] windows stuff --- Installer/win_portable-msvc-readme.md | 2 +- Installer/win_portable-msvc.py | 1 + win_install.bat | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Installer/win_portable-msvc-readme.md b/Installer/win_portable-msvc-readme.md index a12fc2b..1fdd06d 100644 --- a/Installer/win_portable-msvc-readme.md +++ b/Installer/win_portable-msvc-readme.md @@ -1,6 +1,6 @@ This downloads standalone 64-bit MSVC compiler, linker & other tools, also headers/libraries from Windows SDK into portable folder, without installing Visual Studio. Has bare minimum components - no UWP/Store/WindowsRT stuff, just files & tools for 64-bit native desktop app development. -Run `python.exe portable-msvc.py` and it will download output into `msvc` folder. By default it will download latest available MSVC & Windows SDK - currently v14.31 and v10.0.22000.0. +Run `python.exe portable-msvc.py` and it will download output into `msvc` folder. By default it will download latest available MSVC & Windows SDK - currently v14.32.17.2 and v10.0.22621.0. You can list available versions with `python.exe portable-msvc.py --show-versions` and then pass versions you want with `--msvc-version` and `--sdk-version` arguments. diff --git a/Installer/win_portable-msvc.py b/Installer/win_portable-msvc.py index e2a7c0c..428f05a 100644 --- a/Installer/win_portable-msvc.py +++ b/Installer/win_portable-msvc.py @@ -180,6 +180,7 @@ sdk_packages = [ f"Windows SDK for Windows Store Apps Tools-x86_en-us.msi", # Windows SDK headers f"Windows SDK for Windows Store Apps Headers-x86_en-us.msi", + f"Windows SDK Desktop Headers {TARGET}-x86_en-us.msi", # Windows SDK libs f"Windows SDK for Windows Store Apps Libs-x86_en-us.msi", f"Windows SDK Desktop Libs {TARGET}-x86_en-us.msi", diff --git a/win_install.bat b/win_install.bat index d3093de..9d09175 100644 --- a/win_install.bat +++ b/win_install.bat @@ -458,7 +458,7 @@ REM MSVC REM ---------------------------------------------------------------------------- REM This depends on python, so it must be installed after it. set msvc_version=14.32 -set msvc_sdk_version=20348 +set msvc_sdk_version=22621 set msvc_dir=!tools_dir!\msvc_win64_!msvc_version!_win10_sdk_!msvc_sdk_version! if not exist "!msvc_dir!" ( call "!python_exe!" !installer_dir!\win_portable-msvc.py --accept-license --msvc-version !msvc_version! --sdk-version !msvc_sdk_version! || exit /B %ERRORLEVEL%