3 files changed, 2 insertions, 32 deletions
diff --git a/project/Win32BuildSetup/BuildSetup.bat b/project/Win32BuildSetup/BuildSetup.bat
index 50ad49f490..75a6562d41 100644
--- a/project/Win32BuildSetup/BuildSetup.bat
+++ b/project/Win32BuildSetup/BuildSetup.bat
@@ -64,6 +64,7 @@ set WORKSPACE=%CD%\..\..
   
   set EXE= "..\VS2010Express\XBMC\%buildconfig%\%APP_NAME%.exe"
   set PDB= "..\VS2010Express\XBMC\%buildconfig%\%APP_NAME%.pdb"
+  set D3D= "..\VS2010Express\XBMC\%buildconfig%\D3DCompile*.DLL"
   
   :: sets the BRANCH env var
   call getbranch.bat
@@ -200,6 +201,7 @@ set WORKSPACE=%CD%\..\..
   md BUILD_WIN32\application
 
   xcopy %EXE% BUILD_WIN32\application > NUL
+  xcopy %D3D% BUILD_WIN32\application > NUL
   xcopy ..\..\userdata BUILD_WIN32\application\userdata /E /Q /I /Y /EXCLUDE:exclude.txt > NUL
   copy ..\..\copying.txt BUILD_WIN32\application > NUL
   copy ..\..\LICENSE.GPL BUILD_WIN32\application > NUL
diff --git a/project/Win32BuildSetup/genNsisInstaller.nsi b/project/Win32BuildSetup/genNsisInstaller.nsi
index 7c31a5af22..644de4cb89 100644
--- a/project/Win32BuildSetup/genNsisInstaller.nsi
+++ b/project/Win32BuildSetup/genNsisInstaller.nsi
@@ -398,35 +398,10 @@ SectionEnd
 
 SectionGroupEnd
 
-;--------------------------------
-;DirectX web-installer Section
-!define DXVERSIONDLL "$SYSDIR\D3DX9_43.dll"
-Section "DirectX Install" SEC_DIRECTX
-  SectionIn 1 2 #section is in install type Full/Normal and when not installed
-  DetailPrint "Running DirectX Setup..."
-  SetOutPath "$TEMP\dxsetup"
-  File "${app_root}\..\dependencies\dxsetup\*.*"
-  ExecWait '"$TEMP\dxsetup\dxsetup.exe" /silent' $DirectXSetupError
-  RMDir /r "$TEMP\dxsetup"
-  SetOutPath "$INSTDIR"
-  DetailPrint "Finished DirectX Setup"
-SectionEnd
-
-Section "-Check DirectX installation" SEC_DIRECTXCHECK
-
-  IfFileExists ${DXVERSIONDLL} +2 0
-    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
-
 Function .onInit
   ${IfNot} ${AtLeastWinVista}
     MessageBox MB_OK|MB_ICONSTOP|MB_TOPMOST|MB_SETFOREGROUND "Windows Vista or above required.$\nThis program can not be run on Windows XP"
     Quit
   ${EndIf}
-  # set section 'SEC_DIRECTX' as selected and read-only if required dx version not found
-  IfFileExists ${DXVERSIONDLL} +3 0
-  IntOp $0 ${SF_SELECTED} | ${SF_RO}
-  SectionSetFlags ${SEC_DIRECTX} $0
   StrCpy $CleanDestDir "-1"
 FunctionEnd
diff --git a/project/Win32BuildSetup/getdeploydependencies.bat b/project/Win32BuildSetup/getdeploydependencies.bat
index 7828d3ef00..ccacea99aa 100644
--- a/project/Win32BuildSetup/getdeploydependencies.bat
+++ b/project/Win32BuildSetup/getdeploydependencies.bat
@@ -24,12 +24,5 @@ if not exist dependencies\vcredist\2013\vcredist_x86.exe (
   ..\BuildDependencies\bin\wget -nv -O dependencies\vcredist\2013\vcredist_x86.exe %KODI_MIRROR%/build-deps/win32/vcredist/2013/vcredist_x86.exe
 )
 
-if not exist dependencies\dxsetup mkdir dependencies\dxsetup
-for %%f in (DSETUP.dll dsetup32.dll dxdllreg_x86.cab DXSETUP.exe dxupdate.cab Jun2010_D3DCompiler_43_x86.cab Jun2010_d3dx9_43_x86.cab) do (
-  if not exist dependencies\dxsetup\%%f (
-    ..\BuildDependencies\bin\wget -nv -O dependencies\dxsetup\%%f %KODI_MIRROR%/build-deps/win32/dxsetup/%%f
-  )
-)
-
 :: Restore the previous current directory
 POPD