Skip to content

Commit 64d164a

Browse files
committed
Update NSI Install Script: install.nsi
1 parent 19e609d commit 64d164a

1 file changed

Lines changed: 9 additions & 9 deletions

File tree

scripts/build/installer/install.nsi

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
ClearErrors
1010

11-
; All versions require the MSVC 2015 redist for the LOOT API.
11+
; All versions require the MSVC 2017 redist for the LOOT API.
1212
${If} ${RunningX64}
1313
StrCpy $MSVC_Sub_Key "SOFTWARE\Wow6432Node\Microsoft\VisualStudio\14.0\VC\Runtimes\x86"
1414
${Else}
@@ -22,28 +22,28 @@
2222

2323
${If} $MSVC_Installed == "0"
2424
${OrIf} $MSVC_Major < 14
25-
${OrIf} $MSVC_Minor < 0
26-
${OrIf} $MSVC_Bld < 24215
27-
DetailPrint "Visual C++ 2015 Redistributable registry key was not found; assumed to be uninstalled."
28-
DetailPrint "Downloading Visual C++ 2015 Redistributable Setup..."
25+
${OrIf} $MSVC_Minor < 15
26+
${OrIf} $MSVC_Bld < 26706
27+
DetailPrint "Visual C++ 2017 Redistributable registry key was not found; assumed to be uninstalled."
28+
DetailPrint "Downloading Visual C++ 2017 Redistributable Setup..."
2929
SetOutPath $TEMP
30-
NSISdl::download "https://download.microsoft.com/download/6/A/A/6AA4EDFF-645B-48C5-81CC-ED5963AEAD48/vc_redist.x86.exe" "vc_redist.x86.exe"
30+
NSISdl::download "https://download.visualstudio.microsoft.com/download/pr/749aa419-f9e4-4578-a417-a43786af205e/d59197078cc425377be301faba7dd87a/vc_redist.x86.exe" "vc_redist.x86.exe"
3131

3232
Pop $R0 ;Get the return value
3333
${If} $R0 == "success"
34-
DetailPrint "Running Visual C++ 2015 Redistributable Setup..."
34+
DetailPrint "Running Visual C++ 2017 Redistributable Setup..."
3535
Sleep 2000
3636
HideWindow
3737
ExecWait '"$TEMP\vc_redist.x86.exe" /quiet /norestart'
3838
BringToFront
39-
DetailPrint "Finished Visual C++ 2015 Redistributable Setup"
39+
DetailPrint "Finished Visual C++ 2017 Redistributable Setup"
4040

4141
Delete "$TEMP\vc_redist.x86.exe"
4242
${Else}
4343
DetailPrint "Could not contact Microsoft.com, or the file has been (re)moved!"
4444
${EndIf}
4545
${Else}
46-
DetailPrint "Visual C++ 2015 Redistributable is already installed; skipping!"
46+
DetailPrint "Visual C++ 2017 Redistributable is already installed; skipping!"
4747
${EndIf}
4848

4949
; Python version requires Python, wxPython, Python Comtypes and PyWin32.

0 commit comments

Comments
 (0)