diff options
| author | wiso <wiso@svn> | 2009-11-06 19:31:45 +0000 |
|---|---|---|
| committer | wiso <wiso@svn> | 2009-11-06 19:31:45 +0000 |
| commit | a984226a15832b8390e22dedab1dee9822761793 (patch) | |
| tree | ffb4e914337cb1aec2de1e93e3aae74577e9a9c0 /project | |
| parent | e837dc3b45c0ea78dc37853f7f0c6df71e0f4746 (diff) | |
[WIN32DX] added the directx web installer to the XBMC installer. requires an Internet connection. won't change anything if everything needed is already installed.
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@24358 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
Diffstat (limited to 'project')
| -rw-r--r-- | project/Win32BuildSetup/XBMC for Windows.nsi | 23 | ||||
| -rw-r--r-- | project/Win32BuildSetup/dependencies/dxwebsetup.exe | bin | 0 -> 299864 bytes |
2 files changed, 23 insertions, 0 deletions
diff --git a/project/Win32BuildSetup/XBMC for Windows.nsi b/project/Win32BuildSetup/XBMC for Windows.nsi index b5377c3514..a42cecf72d 100644 --- a/project/Win32BuildSetup/XBMC for Windows.nsi +++ b/project/Win32BuildSetup/XBMC for Windows.nsi @@ -34,6 +34,7 @@ Var StartMenuFolder
Var PageProfileState
Var RunArgs
+ Var DirectXSetupError
;--------------------------------
;Interface Settings
@@ -359,3 +360,25 @@ Section "Uninstall" DeleteRegKey /ifempty HKCU "Software\XBMC"
SectionEnd
+
+;--------------------------------
+;DirectX webinstaller Section
+
+!if "${xbmc_target}" == "dx"
+Section "DirectX Install" SEC_DIRECTX
+
+ SectionIn RO
+
+ SetOutPath "$TEMP"
+ File "${xbmc_root}\Xbmc\dxwebsetup.exe"
+ DetailPrint "Running DirectX Setup..."
+ ExecWait '"$TEMP\dxwebsetup.exe" /Q' $DirectXSetupError
+ DetailPrint "Finished DirectX Setup"
+
+ Delete "$TEMP\dxwebsetup.exe"
+
+ SetOutPath "$INSTDIR"
+
+SectionEnd
+!endif
+
diff --git a/project/Win32BuildSetup/dependencies/dxwebsetup.exe b/project/Win32BuildSetup/dependencies/dxwebsetup.exe Binary files differnew file mode 100644 index 0000000000..269c3659a0 --- /dev/null +++ b/project/Win32BuildSetup/dependencies/dxwebsetup.exe |