diff options
| author | Anton Fedchin <anightik@gmail.com> | 2018-12-22 11:10:00 +0300 |
|---|---|---|
| committer | Anton Fedchin <anightik@gmail.com> | 2018-12-22 11:17:06 +0300 |
| commit | a83e3dab7509564bf0b0f7505904e32fbf330dc9 (patch) | |
| tree | 2053aa60887266d25a4ec367b7e779e4a9d4a9df /project | |
| parent | 93e41bde8902667e0b3bbe8ea46212ef4c238338 (diff) | |
[win32] replace vc140 redis with vc141
Diffstat (limited to 'project')
| -rw-r--r-- | project/Win32BuildSetup/genNsisInstaller.nsi | 14 | ||||
| -rw-r--r-- | project/Win32BuildSetup/getdeploydependencies.bat | 8 |
2 files changed, 11 insertions, 11 deletions
diff --git a/project/Win32BuildSetup/genNsisInstaller.nsi b/project/Win32BuildSetup/genNsisInstaller.nsi index bba7eea574..67abeeac82 100644 --- a/project/Win32BuildSetup/genNsisInstaller.nsi +++ b/project/Win32BuildSetup/genNsisInstaller.nsi @@ -326,14 +326,14 @@ SectionEnd ;vs redist installer Section SectionGroup "Microsoft Visual C++ packages" SEC_VCREDIST -Section "VS2015 C++ re-distributable Package (${TARGET_ARCHITECTURE})" SEC_VCREDIST1 -DetailPrint "Running VS2015 re-distributable setup..." +Section "VS2017 C++ re-distributable Package (${TARGET_ARCHITECTURE})" SEC_VCREDIST1 +DetailPrint "Running VS2017 re-distributable setup..." SectionIn 1 2 #section is in install type Full - SetOutPath "$TEMP\vc2015" - File "${app_root}\..\..\BuildDependencies\downloads\vcredist\2015\vcredist_${TARGET_ARCHITECTURE}.exe" - ExecWait '"$TEMP\vc2015\vcredist_${TARGET_ARCHITECTURE}.exe" /install /quiet /norestart' $VSRedistSetupError - RMDir /r "$TEMP\vc2015" - DetailPrint "Finished VS2015 re-distributable setup" + SetOutPath "$TEMP\vc2017" + File "${app_root}\..\..\BuildDependencies\downloads\vcredist\2017\vcredist_${TARGET_ARCHITECTURE}.exe" + ExecWait '"$TEMP\vc2017\vcredist_${TARGET_ARCHITECTURE}.exe" /install /quiet /norestart' $VSRedistSetupError + RMDir /r "$TEMP\vc2017" + DetailPrint "Finished VS2017 re-distributable setup" SetOutPath "$INSTDIR" SectionEnd diff --git a/project/Win32BuildSetup/getdeploydependencies.bat b/project/Win32BuildSetup/getdeploydependencies.bat index d4a69de341..2054984505 100644 --- a/project/Win32BuildSetup/getdeploydependencies.bat +++ b/project/Win32BuildSetup/getdeploydependencies.bat @@ -8,11 +8,11 @@ echo Downloading from mirror %KODI_MIRROR% :: Following commands expect this script's parent directory to be the current directory, so make sure that's so PUSHD %~dp0 -if not exist ..\BuildDependencies\downloads\vcredist\2015 mkdir ..\BuildDependencies\downloads\vcredist\2015 +if not exist ..\BuildDependencies\downloads\vcredist\2017 mkdir ..\BuildDependencies\downloads\vcredist\2017 -if not exist ..\BuildDependencies\downloads\vcredist\2015\vcredist_%TARGET_ARCHITECTURE%.exe ( - echo Downloading vc140 redist... - ..\BuildDependencies\bin\wget --tries=5 --retry-connrefused --waitretry=2 -nv -O ..\BuildDependencies\downloads\vcredist\2015\vcredist_%TARGET_ARCHITECTURE%.exe %KODI_MIRROR%/build-deps/win32/vcredist/2015/vcredist_%TARGET_ARCHITECTURE%.exe +if not exist ..\BuildDependencies\downloads\vcredist\2017\vcredist_%TARGET_ARCHITECTURE%.exe ( + echo Downloading vc141 redist... + ..\BuildDependencies\bin\wget --tries=5 --retry-connrefused --waitretry=2 -nv -O ..\BuildDependencies\downloads\vcredist\2017\vcredist_%TARGET_ARCHITECTURE%.exe %KODI_MIRROR%/build-deps/win32/vcredist/2017/vcredist_%TARGET_ARCHITECTURE%.exe ) :: Restore the previous current directory POPD |