diff options
| author | Martijn Kaijser <mcm.kaijser@gmail.com> | 2015-12-12 11:36:10 +0100 |
|---|---|---|
| committer | Martijn Kaijser <mcm.kaijser@gmail.com> | 2015-12-12 11:36:10 +0100 |
| commit | 976a4190a3b3c6f2e37a90c8405768532107ca6a (patch) | |
| tree | d01eafcd808efdd1c5f8ca8b159d1350465fdf31 | |
| parent | c80bcfa018076194b6d6a61a03417ea54757ecf4 (diff) | |
[win32] add VS2015 redist files to installer
| -rw-r--r-- | project/Win32BuildSetup/genNsisInstaller.nsi | 11 | ||||
| -rw-r--r-- | project/Win32BuildSetup/getdeploydependencies.bat | 6 |
2 files changed, 17 insertions, 0 deletions
diff --git a/project/Win32BuildSetup/genNsisInstaller.nsi b/project/Win32BuildSetup/genNsisInstaller.nsi index a3e2ac2c3d..ccd74513fd 100644 --- a/project/Win32BuildSetup/genNsisInstaller.nsi +++ b/project/Win32BuildSetup/genNsisInstaller.nsi @@ -398,6 +398,17 @@ DetailPrint "Running VS2013 re-distributable setup..." SetOutPath "$INSTDIR" SectionEnd +Section "VS2015 C++ re-distributable Package (x86)" SEC_VCREDIST4 +DetailPrint "Running VS2015 re-distributable setup..." + SectionIn 1 2 #section is in install type Full + SetOutPath "$TEMP\vc2015" + File "${app_root}\..\dependencies\vcredist\2015\vcredist_x86.exe" + ExecWait '"$TEMP\vc2015\vcredist_x86.exe" /q' $VSRedistSetupError + RMDir /r "$TEMP\vc2015" + DetailPrint "Finished VS2015 re-distributable setup" + SetOutPath "$INSTDIR" +SectionEnd + SectionGroupEnd Function .onInit diff --git a/project/Win32BuildSetup/getdeploydependencies.bat b/project/Win32BuildSetup/getdeploydependencies.bat index ccacea99aa..a3e2d7892e 100644 --- a/project/Win32BuildSetup/getdeploydependencies.bat +++ b/project/Win32BuildSetup/getdeploydependencies.bat @@ -11,6 +11,8 @@ PUSHD %~dp0 if not exist dependencies\vcredist\2008 mkdir dependencies\vcredist\2008 if not exist dependencies\vcredist\2010 mkdir dependencies\vcredist\2010 if not exist dependencies\vcredist\2013 mkdir dependencies\vcredist\2013 +if not exist dependencies\vcredist\2015 mkdir dependencies\vcredist\2015 + if not exist dependencies\vcredist\2008\vcredist_x86.exe ( echo Downloading vc90 redist... ..\BuildDependencies\bin\wget -nv -O dependencies\vcredist\2008\vcredist_x86.exe %KODI_MIRROR%/build-deps/win32/vcredist/2008/vcredist_x86.exe @@ -24,5 +26,9 @@ if not exist dependencies\vcredist\2013\vcredist_x86.exe ( ..\BuildDependencies\bin\wget -nv -O dependencies\vcredist\2013\vcredist_x86.exe %KODI_MIRROR%/build-deps/win32/vcredist/2013/vcredist_x86.exe ) +if not exist dependencies\vcredist\2015\vcredist_x86.exe ( + echo Downloading vc140 redist... + ..\BuildDependencies\bin\wget -nv -O dependencies\vcredist\2015\vcredist_x86.exe %KODI_MIRROR%/build-deps/win32/vcredist/2015/vcredist_x86.exe +) :: Restore the previous current directory POPD |