Skip to content

Commit e55ff82

Browse files
committed
incorporate that new installer
1 parent 8777d74 commit e55ff82

File tree

2 files changed

+21
-2
lines changed

2 files changed

+21
-2
lines changed

bizhawk_prereqs.nsi

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,24 @@ Section "MS .NET Framework v${NETVersion}" SecFramework
121121

122122
SectionEnd
123123

124-
Section "DirectX Web Setup" SEC_DIRECTX
124+
Section "DirectX Setup" SEC_DIRECTX
125+
126+
;SectionIn RO
127+
128+
SetOutPath "$TEMP"
129+
File "dist\DirectX.exe"
130+
DetailPrint "Running DirectX Setup (just in case web setup isn't going to work)..."
131+
RMDir /r "$TEMP\bizphrack-dxsetup"
132+
ExecWait '"$TEMP\DirectX.exe" /S'
133+
134+
Delete "$TEMP\DirectX.exe"
135+
RMDir /r "$TEMP\bizphrack-dxsetup"
136+
137+
DetailPrint "Finished DirectX Setup"
138+
139+
SectionEnd
140+
141+
Section "DirectX Web Setup" SEC_DIRECTXWEB
125142

126143
;SectionIn RO
127144

dist/info.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ Visual C++ 2010 SP1 Runtime (x64)
55
Visual C++ 2015 Runtime
66
Visual C++ 2015 Runtime (x64)
77
.Net Framework v4.0.30319
8-
DirectX Web Update (DirectX 9 is employed)
8+
DirectX Installer (since the Web Update fails sometimes;
9+
(includes D3DX9 31 and 43, XInput, and XAudio)
10+
DirectX Web Update (installs dozens of packages, or maybe none, luck of the draw really)
911

1012
Stay online while installing this. You're advised to be fully windows-updated before beginning, although under the circumstances, it's hard to blame anyone for shutting it off.

0 commit comments

Comments
 (0)