diff --git a/configure.in b/configure.in index 58f00eeac2..009b892c88 100644 --- a/configure.in +++ b/configure.in @@ -4542,10 +4542,7 @@ dnl ======================================================== MOZ_ANGLE_RENDERER= MOZ_DIRECTX_SDK_PATH= MOZ_DIRECTX_SDK_CPU_SUFFIX= -MOZ_D3DX9_VERSION= -MOZ_D3DX9_CAB= MOZ_D3DCOMPILER_CAB= -MOZ_D3DX9_DLL= MOZ_D3DCOMPILER_DLL= case "$target_os" in *mingw*) @@ -4603,10 +4600,9 @@ if test -n "$MOZ_ANGLE_RENDERER" -a -z "$CROSS_COMPILE"; then AC_MSG_ERROR([Couldn't determine the D3DX9 version, needed for WebGL. Either reinstall the DirectX SDK (June 2010 version or newer), or reconfigure with --disable-webgl.]) fi - MOZ_D3DX9_CAB=`find "$MOZ_DIRECTX_SDK_PATH"/Redist -name *d3dx9_${MOZ_D3DX9_VERSION}_${MOZ_DIRECTX_SDK_CPU_SUFFIX}.cab | head -n1` MOZ_D3DCOMPILER_CAB=`find "$MOZ_DIRECTX_SDK_PATH"/Redist -name *D3DCompiler_${MOZ_D3DX9_VERSION}_${MOZ_DIRECTX_SDK_CPU_SUFFIX}.cab | head -n1` - if test -z "$MOZ_D3DX9_CAB" -o -z "$MOZ_D3DCOMPILER_CAB"; then + if test -z "$MOZ_D3DCOMPILER_CAB"; then AC_MSG_ERROR([Couldn't find the DirectX redistributable files. Either reinstall the DirectX SDK (making sure the "DirectX Redistributable Files" option is selected), or reconfigure with --disable-webgl.]) fi @@ -6092,9 +6088,7 @@ AC_SUBST(MOZ_ANGLE_RENDERER) AC_SUBST(MOZ_DIRECTX_SDK_PATH) AC_SUBST(MOZ_DIRECTX_SDK_CPU_SUFFIX) AC_SUBST(MOZ_D3DX9_VERSION) -AC_SUBST(MOZ_D3DX9_CAB) AC_SUBST(MOZ_D3DCOMPILER_CAB) -AC_SUBST(MOZ_D3DX9_DLL) AC_SUBST(MOZ_D3DCOMPILER_DLL) AC_SUBST(ENABLE_STRIP) diff --git a/suite/installer/Makefile.in b/suite/installer/Makefile.in index ffaaac7e00..9ee5af93c9 100644 --- a/suite/installer/Makefile.in +++ b/suite/installer/Makefile.in @@ -43,7 +43,6 @@ endif ifdef MOZ_ANGLE_RENDERER DEFINES += -DMOZ_ANGLE_RENDERER=$(MOZ_ANGLE_RENDERER) -DEFINES += -DMOZ_D3DX9_DLL=$(MOZ_D3DX9_DLL) DEFINES += -DMOZ_D3DCOMPILER_DLL=$(MOZ_D3DCOMPILER_DLL) endif diff --git a/suite/installer/package-manifest.in b/suite/installer/package-manifest.in index 485049c0a6..08b6f1028e 100644 --- a/suite/installer/package-manifest.in +++ b/suite/installer/package-manifest.in @@ -82,7 +82,6 @@ #ifdef MOZ_ANGLE_RENDERER @BINPATH@/libEGL.dll @BINPATH@/libGLESv2.dll -@BINPATH@/@MOZ_D3DX9_DLL@ @BINPATH@/@MOZ_D3DCOMPILER_DLL@ #endif #ifdef XP_WIN32 diff --git a/suite/installer/removed-files.in b/suite/installer/removed-files.in index f430024d8c..346e0caa3a 100644 --- a/suite/installer/removed-files.in +++ b/suite/installer/removed-files.in @@ -191,6 +191,7 @@ components/nsIQTScriptablePlugin.xpt #endif D3DCompiler_42.dll d3dx9_42.dll +d3dx9_43.dll #ifdef UNIX_BUT_NOT_MAC components/nsFilePicker.js #endif