Fix Thunderbird windows bustage due to
bug 837568 by doing the Thunderbird part of the port of
bug 808785. r=bustage fix for CLOSED TREE
Fix Thunderbird windows bustage due to
bug 837568 by doing the Thunderbird part of the port of
bug 808785. r=bustage fix for CLOSED TREE
--- a/configure.in
+++ b/configure.in
@@ -4601,17 +4601,16 @@ if test -n "$MOZ_ANGLE_RENDERER" -a -z "
fi
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_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
- MOZ_D3DX9_DLL=d3dx9_$MOZ_D3DX9_VERSION.dll
MOZ_D3DCOMPILER_DLL=D3DCompiler_$MOZ_D3DX9_VERSION.dll
fi
dnl ========================================================
dnl = Breakpad crash reporting (on by default on supported platforms)
dnl ========================================================
case $target in
--- a/mail/installer/Makefile.in
+++ b/mail/installer/Makefile.in
@@ -36,17 +36,16 @@ endif
ifdef _MSC_VER
DEFINES += -D_MSC_VER=$(_MSC_VER)
endif
DEFINES += -DJAREXT=
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
ifdef MOZ_UPDATER
DEFINES += -DMOZ_UPDATER=1
endif
include $(MOZILLA_SRCDIR)/ipc/app/defs.mk
--- a/mail/installer/package-manifest.in
+++ b/mail/installer/package-manifest.in
@@ -88,17 +88,16 @@
@BINPATH@/@DLL_PREFIX@plugin_child_interpose@DLL_SUFFIX@
#else
@BINPATH@/@MOZ_CHILD_PROCESS_NAME@
#endif
; ANGLE GLES-on-D3D rendering library
#ifdef MOZ_ANGLE_RENDERER
@BINPATH@/libEGL.dll
@BINPATH@/libGLESv2.dll
-@BINPATH@/@MOZ_D3DX9_DLL@
@BINPATH@/@MOZ_D3DCOMPILER_DLL@
#endif
; Modules
@BINPATH@/modules/*
; Optional RSS extension
[newsblog]
--- a/mail/installer/removed-files.in
+++ b/mail/installer/removed-files.in
@@ -114,16 +114,17 @@ components/@DLL_PREFIX@xpinstal@DLL_SUFF
components/@DLL_PREFIX@xpinstall@DLL_SUFFIX@
components/xpti.dat
components/xptitemp.dat
components/myspell/en-US.dic
components/myspell/en-US.aff
components/myspell/
D3DCompiler_42.dll
d3dx9_42.dll
+d3dx9_43.dll
defaults/isp/dotmac.rdf
defaults/isp/movemail.rdf
defaults/isp/rss.rdf
defaults/isp/en-US/dotmac.rdf
defaults/isp/en-US/movemail.rdf
defaults/isp/en-US/rss.rdf
defaults/isp/en-US/
defaults/isp/US/movemail.rdf