incorporate that new installer

TASEmulators · Nov 18, 2016 · e55ff82 · e55ff82
1 parent 8777d74
commit e55ff82
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/bizhawk_prereqs.nsi b/bizhawk_prereqs.nsi
@@ -121,7 +121,24 @@ Section "MS .NET Framework v${NETVersion}" SecFramework
 
 SectionEnd
 
-Section "DirectX Web Setup" SEC_DIRECTX
+Section "DirectX Setup" SEC_DIRECTX
+
+ ;SectionIn RO
+
+ SetOutPath "$TEMP"
+ File "dist\DirectX.exe"
+ DetailPrint "Running DirectX Setup (just in case web setup isn't going to work)..."
+ RMDir /r "$TEMP\bizphrack-dxsetup"                                                                             
+ ExecWait '"$TEMP\DirectX.exe" /S'
+
+ Delete "$TEMP\DirectX.exe"
+ RMDir /r "$TEMP\bizphrack-dxsetup"
+
+ DetailPrint "Finished DirectX Setup"                                     
+
+SectionEnd
+
+Section "DirectX Web Setup" SEC_DIRECTXWEB
 
  ;SectionIn RO
 

diff --git a/dist/info.txt b/dist/info.txt
@@ -5,6 +5,8 @@ Visual C++ 2010 SP1 Runtime (x64)
 Visual C++ 2015 Runtime
 Visual C++ 2015 Runtime (x64)
 .Net Framework v4.0.30319
-DirectX Web Update (DirectX 9 is employed)
+DirectX Installer  (since the Web Update fails sometimes; 
+                   (includes D3DX9 31 and 43, XInput, and XAudio)
+DirectX Web Update (installs dozens of packages, or maybe none, luck of the draw really)
 
 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.