diff options
| author | CrystalPT <CrystalPT@svn> | 2010-07-18 00:23:40 +0000 |
|---|---|---|
| committer | CrystalPT <CrystalPT@svn> | 2010-07-18 00:23:40 +0000 |
| commit | 97add4ea07ad49a40902e6a31df6cebc1a708aed (patch) | |
| tree | 09d2f2691ea0d89ecdd13081102a61438b382316 /project/Win32BuildSetup/XBMC for Windows.nsi | |
| parent | 8fb3cfefb688261d0437648986328e456d5df956 (diff) | |
[WIN32] fixed: dx installer fixed and mandatory
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@31923 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
Diffstat (limited to 'project/Win32BuildSetup/XBMC for Windows.nsi')
| -rw-r--r-- | project/Win32BuildSetup/XBMC for Windows.nsi | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/project/Win32BuildSetup/XBMC for Windows.nsi b/project/Win32BuildSetup/XBMC for Windows.nsi index 8603619f62..f29dfb11cb 100644 --- a/project/Win32BuildSetup/XBMC for Windows.nsi +++ b/project/Win32BuildSetup/XBMC for Windows.nsi @@ -328,31 +328,24 @@ SectionEnd ;DirectX webinstaller Section
!if "${xbmc_target}" == "dx"
-Section "DirectX WebInstall" SEC_DIRECTX
+Section "DirectX Install" SEC_DIRECTX
- SectionIn 1 2
-
- SetOutPath "$TEMP"
- File "${xbmc_root}\Xbmc\dxwebsetup.exe"
+ SectionIn 1 2 RO
+
DetailPrint "Running DirectX Setup..."
- ExecWait '"$TEMP\dxwebsetup.exe" /Q /r:n' $DirectXSetupError
- Delete "$TEMP\dxwebsetup.exe"
- SetOutPath "$INSTDIR"
- ;do minimal install if webinstaller failed for some reason
- IfFileExists $SYSDIR\D3DX9_43.dll done
SetOutPath "$TEMP\dxsetup"
- File "${xbmc_root}\..\dependencies\dxsetup\Aug2009_d3dx9_42_x86.cab"
File "${xbmc_root}\..\dependencies\dxsetup\dsetup32.dll"
File "${xbmc_root}\..\dependencies\dxsetup\DSETUP.dll"
File "${xbmc_root}\..\dependencies\dxsetup\dxdllreg_x86.cab"
File "${xbmc_root}\..\dependencies\dxsetup\DXSETUP.exe"
File "${xbmc_root}\..\dependencies\dxsetup\dxupdate.cab"
+ File "${xbmc_root}\..\dependencies\dxsetup\Jun2010_D3DCompiler_43_x86.cab"
+ File "${xbmc_root}\..\dependencies\dxsetup\Jun2010_d3dx9_43_x86.cab"
ExecWait '"$TEMP\dxsetup\dxsetup.exe" /silent' $DirectXSetupError
RMDir /r "$TEMP\dxsetup"
SetOutPath "$INSTDIR"
- done:
DetailPrint "Finished DirectX Setup"
SectionEnd
@@ -360,7 +353,7 @@ SectionEnd Section "-Check DirectX installation" SEC_DIRECTXCHECK
IfFileExists $SYSDIR\D3DX9_43.dll +2 0
- MessageBox MB_OK|MB_ICONSTOP|MB_TOPMOST|MB_SETFOREGROUND "DirectX9 wasn't installed properly.$\nPlease download the DirectX End-User Runtimes from Microsoft and install it again."
+ MessageBox MB_OK|MB_ICONSTOP|MB_TOPMOST|MB_SETFOREGROUND "DirectX9 wasn't installed properly.$\nPlease download the DirectX End-User Runtime from Microsoft and install it again."
SectionEnd
!endif
\ No newline at end of file |