diff --git a/Installer/Requirements/vcredist_x64.exe b/Installer/Requirements/vcredist_x64.exe new file mode 100644 index 00000000..fbd1ad83 Binary files /dev/null and b/Installer/Requirements/vcredist_x64.exe differ diff --git a/Installer/Requirements/vcredist_x86.exe b/Installer/Requirements/vcredist_x86.exe new file mode 100644 index 00000000..f0d944e7 Binary files /dev/null and b/Installer/Requirements/vcredist_x86.exe differ diff --git a/Installer/installer.nsi b/Installer/installer.nsi index cf845efa..23350f52 100644 --- a/Installer/installer.nsi +++ b/Installer/installer.nsi @@ -21,6 +21,7 @@ Var StartMenuFolder Var DirectXSetupError Var NetSetupError + Var VCSetupError !define MUI_ICON "..\Output\Vocaluxe.ico" !define MUI_HEADERIMAGE @@ -114,7 +115,7 @@ Section $(TITLE_MAIN) SecMain File "..\Output\CreditsRessourcesDB.sqlite" ${IfNot} ${HasDotNet4.0} - SetOutPath "$TEMP" + SetOutPath "$TEMP" File "Requirements\dotNetFx40_Full_setup.exe" DetailPrint "Running .NET4 Setup..." ExecWait '"$TEMP\dotNetFx40_Full_setup.exe" /Q' $NetSetupError @@ -125,6 +126,24 @@ Section $(TITLE_MAIN) SecMain SetOutPath "$INSTDIR" ${EndIf} + SetOutPath "$TEMP" + ${If} ${RunningX64} + File "Requirements\vcredist_x64.exe" + DetailPrint "Running VC++ 2012 Redistributable Setup..." + ExecWait '"$TEMP\vcredist_x64.exe" /Q /norestart' $VCSetupError + DetailPrint "Finished VC++ 2012 Redistributable Setup" + + Delete "$TEMP\vcredist_x64.exe" + ${Else} + File "Requirements\vcredist_x86.exe" + DetailPrint "Running VC++ 2012 Redistributable Setup..." + ExecWait '"$TEMP\vcredist_x86.exe" /Q /norestart' $VCSetupError + DetailPrint "Finished VC++ 2012 Redistributable Setup" + + Delete "$TEMP\vcredist_x86.exe" + ${EndIf} + SetOutPath "$INSTDIR" + ;Store installation folder WriteRegStr HKCU "Software\Vocaluxe" "" $INSTDIR