From fc474f8e82041c0d60546eebacdbe9ff64be4877 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Wed, 2 Jun 2021 09:05:45 +0200 Subject: [PATCH] non quiet msvc runtime --- resources/nsis/NSIS.template.in | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/resources/nsis/NSIS.template.in b/resources/nsis/NSIS.template.in index 9b2a2922f..c092fb4f5 100755 --- a/resources/nsis/NSIS.template.in +++ b/resources/nsis/NSIS.template.in @@ -127,16 +127,6 @@ NotInstalled: ; Install core application files. File /r "${BINARY_TREE}\" - ; Install MSVCRT libraries. - ExecWait '"$INSTDIR\vc_redist.x64.exe" /install /quiet /norestart' - Delete "$INSTDIR\vc_redist.x64.exe" - - ExecWait '"$INSTDIR\vc_redist_2010.x86.exe" /q /norestart' - Delete "$INSTDIR\vc_redist_2010.x86.exe" - - ExecWait '"$INSTDIR\vc_redist_2010.x64.exe" /q /norestart' - Delete "$INSTDIR\vc_redist_2010.x64.exe" - ; Create uninstaller. WriteUninstaller "$INSTDIR\Uninstall.exe" @@ -147,6 +137,16 @@ NotInstalled: WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}" "InstallLocation" "$INSTDIR" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}" "UninstallString" "$\"$INSTDIR\Uninstall.exe$\"" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}" "QuietUninstallString" "$\"$INSTDIR\Uninstall.exe$\" /S" + + ; Install MSVCRT libraries. + ExecWait '"$INSTDIR\vc_redist.x64.exe" /norestart' + Delete "$INSTDIR\vc_redist.x64.exe" + + ExecWait '"$INSTDIR\vc_redist_2010.x86.exe" /norestart' + Delete "$INSTDIR\vc_redist_2010.x86.exe" + + ExecWait '"$INSTDIR\vc_redist_2010.x64.exe" /norestart' + Delete "$INSTDIR\vc_redist_2010.x64.exe" SectionEnd Section "Desktop Icon" DesktopIcon