[win32] add VS2015 redist files to installer

xbmc · Dec 12, 2015 · 976a419 · 976a419
1 parent c80bcfa
commit 976a419
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git 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
@@ -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