diff options
| author | thexai <58434170+thexai@users.noreply.github.com> | 2022-10-01 17:40:49 +0200 |
|---|---|---|
| committer | thexai <58434170+thexai@users.noreply.github.com> | 2022-10-01 18:10:33 +0200 |
| commit | 491841e0733afbe6521bd7ce3c875b3ccfd6f0ab (patch) | |
| tree | ef37b9fa05643b9fdc07b455042817a617a5bed8 /project | |
| parent | 3066d800934f39c28b951c69930d3cbee5fd6308 (diff) | |
[Windows] Updates Microsoft Visual C++ Runtime
Diffstat (limited to 'project')
| -rw-r--r-- | project/Win32BuildSetup/genNsisInstaller.nsi | 14 | ||||
| -rw-r--r-- | project/Win32BuildSetup/getdeploydependencies.bat | 6 |
2 files changed, 10 insertions, 10 deletions
diff --git a/project/Win32BuildSetup/genNsisInstaller.nsi b/project/Win32BuildSetup/genNsisInstaller.nsi index 8127b46b89..ee7e75223a 100644 --- a/project/Win32BuildSetup/genNsisInstaller.nsi +++ b/project/Win32BuildSetup/genNsisInstaller.nsi @@ -328,14 +328,14 @@ SectionEnd ;vs redist installer Section SectionGroup "Microsoft Visual C++ packages" SEC_VCREDIST -Section "VS2017-2019 C++ re-distributable Package (${TARGET_ARCHITECTURE})" SEC_VCREDIST1 -DetailPrint "Running VS2017-2019 re-distributable setup..." +Section "Visual C++ 2015-2022 Redistributable Package (${TARGET_ARCHITECTURE})" SEC_VCREDIST1 +DetailPrint "Running Visual C++ 2015-2022 Redistributable setup..." SectionIn 1 2 #section is in install type Full - SetOutPath "$TEMP\vc2019" - File "${app_root}\..\..\BuildDependencies\downloads\vcredist\2017-2019\vcredist_${TARGET_ARCHITECTURE}.exe" - ExecWait '"$TEMP\vc2019\vcredist_${TARGET_ARCHITECTURE}.exe" /install /quiet /norestart' $VSRedistSetupError - RMDir /r "$TEMP\vc2019" - DetailPrint "Finished VS2017-2019 re-distributable setup" + SetOutPath "$TEMP\vcredist" + File "${app_root}\..\..\BuildDependencies\downloads\vcredist\2015-2022\vcredist_${TARGET_ARCHITECTURE}.exe" + ExecWait '"$TEMP\vcredist\vcredist_${TARGET_ARCHITECTURE}.exe" /install /quiet /norestart' $VSRedistSetupError + RMDir /r "$TEMP\vcredist" + DetailPrint "Finished Visual C++ 2015-2022 Redistributable setup" SetOutPath "$INSTDIR" SectionEnd diff --git a/project/Win32BuildSetup/getdeploydependencies.bat b/project/Win32BuildSetup/getdeploydependencies.bat index c339111f8e..bd66ce14bb 100644 --- a/project/Win32BuildSetup/getdeploydependencies.bat +++ b/project/Win32BuildSetup/getdeploydependencies.bat @@ -1,7 +1,7 @@ @echo off -set DOWNLOAD_URL=https://aka.ms/vs/16/release/vc_redist.%TARGET_ARCHITECTURE%.exe -set DOWNLOAD_FOLDER=..\BuildDependencies\downloads\vcredist\2017-2019 +set DOWNLOAD_URL=https://aka.ms/vs/17/release/vc_redist.%TARGET_ARCHITECTURE%.exe +set DOWNLOAD_FOLDER=..\BuildDependencies\downloads\vcredist\2015-2022 set DOWNLOAD_FILE=vcredist_%TARGET_ARCHITECTURE%.exe :: Following commands expect this script's parent directory to be the current directory, so make sure that's so @@ -10,7 +10,7 @@ PUSHD %~dp0 if not exist %DOWNLOAD_FOLDER% mkdir %DOWNLOAD_FOLDER% if not exist %DOWNLOAD_FOLDER%\%DOWNLOAD_FILE% ( - echo Downloading vc142 redist... + echo Downloading vc143 redist... ..\BuildDependencies\bin\wget --tries=5 --retry-connrefused --waitretry=2 -nv -O %DOWNLOAD_FOLDER%\%DOWNLOAD_FILE% %DOWNLOAD_URL% ) :: Restore the previous current directory |