Skip to content

Commit

Permalink
use new 'Microsoft Visual C++ Redistributable for Visual Studio 2015,…
Browse files Browse the repository at this point in the history
… 2017 and 2019' instead of 2015

note: the exe change is NOT a rename. Git reports it as such despite the contents being different.
  • Loading branch information
zeromus committed Feb 24, 2020
1 parent 4a4f6f5 commit f8f5aae
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
14 changes: 7 additions & 7 deletions bizhawk_prereqs.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ LicenseData "dist\info.txt"
Page license
Page instfiles

Section "KB2999226 (prerequisite for installing C++ 2015 runtime on win7-win8.1)" SEC_KB2999226
Section "KB2999226 (prerequisite for installing 'UCRT' on win7-win8.1)" SEC_KB2999226
SetOutPath "$TEMP"
File "dist\UCRT\Windows6.1-KB2999226-x64.msu"
File "dist\UCRT\Windows8.1-KB2999226-x64.msu"
Expand All @@ -56,15 +56,15 @@ Section "Microsoft Visual C++ 2010 SP1 Runtime (x64)" SEC_CRT2010_SP1_X64

SectionEnd

Section "Microsoft Visual C++ 2015 Runtime (x64)" SEC_CRT2015_X64
Section "'Microsoft Visual C++ Redistributable for Visual Studio 2015, 2017 and 2019' (x64)" SEC_CRTULTIMATE_X64

SetOutPath "$TEMP"
File "dist\vcredist_2015_x64.exe"
DetailPrint "Running Visual C++ 2015 Runtime SP1 (x64) Setup..."
ExecWait '"$TEMP\vcredist_2015_x64.exe" /quiet'
DetailPrint "Finished Visual C++ 2015 Runtime SP1 (x64) Runtime Setup"
File "dist\VC_redist.x64.exe"
DetailPrint "Running 'Microsoft Visual C++ Redistributable for Visual Studio 2015, 2017 and 2019' (x64) Setup..."
ExecWait '"$TEMP\VC_redist.x64.exe" /quiet'
DetailPrint "Finished 'Microsoft Visual C++ Redistributable for Visual Studio 2015, 2017 and 2019' (x64) Setup"

Delete "$TEMP\vcredist_2015_x64.exe"
Delete "$TEMP\VC_redist.x64.exe"

SectionEnd

Expand Down
Binary file not shown.
4 changes: 2 additions & 2 deletions dist/info.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
KB2999226 (prerequisite for installing C++ 2015 runtime on vista-win8.1)
Visual C++ 2010 SP1 Runtime (x64)
Visual C++ 2015 Runtime (x64)
KB2999226 (prerequisite for installing 'UCRT' on vista-win8.1)
'Microsoft Visual C++ Redistributable for Visual Studio 2015, 2017 and 2019' (x64)
.Net Framework v4.8
DirectX Installer (since the Web Update fails sometimes;
>> includes D3DX9 31 and 43, XInput, and XAudio
Expand Down

0 comments on commit f8f5aae

Please sign in to comment.