diff options
| author | Martijn Kaijser <mcm.kaijser@gmail.com> | 2016-03-19 14:54:38 +0100 |
|---|---|---|
| committer | Martijn Kaijser <mcm.kaijser@gmail.com> | 2016-03-19 14:54:38 +0100 |
| commit | f6444736ea99514939ef634edf9193da757b0c96 (patch) | |
| tree | 617ad2b927bb81c93e14b3bc201e3f9e60e047d7 /project | |
| parent | 908b2b41acfdb62ef4f1166b89a5c067a4058122 (diff) | |
[win32] update VC redist install options
Diffstat (limited to 'project')
| -rw-r--r-- | project/Win32BuildSetup/genNsisInstaller.nsi | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/project/Win32BuildSetup/genNsisInstaller.nsi b/project/Win32BuildSetup/genNsisInstaller.nsi index 297944898c..c74a1a68f6 100644 --- a/project/Win32BuildSetup/genNsisInstaller.nsi +++ b/project/Win32BuildSetup/genNsisInstaller.nsi @@ -385,7 +385,7 @@ Section "VS2010 C++ re-distributable Package (x86)" SEC_VCREDIST2 SectionIn 1 2 #section is in install type Full SetOutPath "$TEMP\vc2010" File "${app_root}\..\dependencies\vcredist\2010\vcredist_x86.exe" - ExecWait '"$TEMP\vc2010\vcredist_x86.exe" /q' $VSRedistSetupError + ExecWait '"$TEMP\vc2010\vcredist_x86.exe" /q /norestart' $VSRedistSetupError RMDir /r "$TEMP\vc2010" DetailPrint "Finished VS2010 re-distributable setup" SectionEnd @@ -395,7 +395,7 @@ DetailPrint "Running VS2013 re-distributable setup..." SectionIn 1 2 #section is in install type Full SetOutPath "$TEMP\vc2013" File "${app_root}\..\dependencies\vcredist\2013\vcredist_x86.exe" - ExecWait '"$TEMP\vc2013\vcredist_x86.exe" /q' $VSRedistSetupError + ExecWait '"$TEMP\vc2013\vcredist_x86.exe" /install /quiet /norestart' $VSRedistSetupError RMDir /r "$TEMP\vc2013" DetailPrint "Finished VS2013 re-distributable setup" SetOutPath "$INSTDIR" @@ -406,7 +406,7 @@ 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 + ExecWait '"$TEMP\vc2015\vcredist_x86.exe" /install /quiet /norestart' $VSRedistSetupError RMDir /r "$TEMP\vc2015" DetailPrint "Finished VS2015 re-distributable setup" SetOutPath "$INSTDIR" |