Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 22:01:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 808785. Stop shipping d3dx9_43.dll. r=bjacob

Browse Source 
Since ANGLE revision 1314 / issue 311:
http://code.google.com/p/angleproject/issues/detail?id=311 d3dx9_43.dll is no
longer needed.

--HG--
extra : rebase_source : cb02a61730f4a24f807662269693be2dde673ff0
This commit is contained in:
Jeff Muizelaar 2013-01-28 11:52:06 -05:00
parent d698a86632
commit 91cbf694b0
9 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
browser/installer/Makefile.in
View File

@ -64,7 +64,6 @@ 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

1
browser/installer/package-manifest.in
View File

@ -534,7 +534,6 @@
#ifdef MOZ_ANGLE_RENDERER
@BINPATH@/libEGL.dll
@BINPATH@/libGLESv2.dll
@BINPATH@/@MOZ_D3DX9_DLL@
@BINPATH@/@MOZ_D3DCOMPILER_DLL@
#endif

1
browser/installer/removed-files.in
View File

@ -91,6 +91,7 @@ components/nsProxyAutoConfig.manifest
components/nsProxyAutoConfig.js
D3DCompiler_42.dll
d3dx9_42.dll
d3dx9_43.dll
defaults/pref/all.js
defaults/pref/bug259708.js
defaults/pref/bug307259.js

9
configure.in
View File

@ -5825,10 +5825,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*)
@ -5886,14 +5883,12 @@ 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
MOZ_D3DX9_DLL=d3dx9_$MOZ_D3DX9_VERSION.dll
MOZ_D3DCOMPILER_DLL=D3DCompiler_$MOZ_D3DX9_VERSION.dll
fi
@ -8478,9 +8473,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(MOZ_METRO)

3
gfx/angle/Makefile.in
View File

@ -133,9 +133,6 @@ ifdef MOZ_ANGLE_RENDERER
DIRS = src/libGLESv2 src/libEGL
libs::
ifdef MOZ_D3DX9_CAB
expand "$(MOZ_D3DX9_CAB)" -F:$(MOZ_D3DX9_DLL) "$(DIST)/bin"
endif
ifdef MOZ_D3DCOMPILER_CAB
expand "$(MOZ_D3DCOMPILER_CAB)" -F:$(MOZ_D3DCOMPILER_DLL) "$(DIST)/bin"
endif

5
gfx/angle/src/libGLESv2/Makefile.in
View File

@ -189,15 +189,14 @@ TextureSSE2.$(OBJ_SUFFIX): CXXFLAGS+=-msse2
OS_CXXFLAGS := $(filter-out -fno-exceptions,$(OS_CXXFLAGS)) -fexceptions
OS_LIBS += -ld3d9
ifdef MOZ_D3DX9_VERSION
OS_LIBS += -ld3dx9_$(MOZ_D3DX9_VERSION) -ld3dcompiler_$(MOZ_D3DX9_VERSION)
OS_LIBS += -ld3dcompiler_$(MOZ_D3DX9_VERSION)
else
OS_LIBS += -ld3dx9 -ld3dcompiler
OS_LIBS += -ld3dcompiler
endif
else
EXTRA_DSO_LDOPTS = "$(MOZ_DIRECTX_SDK_PATH)/lib/$(MOZ_DIRECTX_SDK_CPU_SUFFIX)/d3d9.lib" \
"$(MOZ_DIRECTX_SDK_PATH)/lib/$(MOZ_DIRECTX_SDK_CPU_SUFFIX)/d3dx9.lib" \
"$(MOZ_DIRECTX_SDK_PATH)/lib/$(MOZ_DIRECTX_SDK_CPU_SUFFIX)/D3DCompiler.lib"
endif

6
gfx/gl/GLLibraryEGL.cpp
View File

@ -101,12 +101,6 @@ GLLibraryEGL::EnsureInitialized()
// libraries. This matters especially for WebRT apps which are in a different directory.
// See bug 760323 and bug 749459
#ifndef MOZ_D3DX9_DLL
#error MOZ_D3DX9_DLL should have been defined by the Makefile
#endif
LoadLibraryForEGLOnWindows(NS_LITERAL_STRING(NS_STRINGIFY(MOZ_D3DX9_DLL)));
// intentionally leak the D3DX9_DLL library
#ifndef MOZ_D3DCOMPILER_DLL
#error MOZ_D3DCOMPILER_DLL should have been defined by the Makefile
#endif

1
gfx/gl/Makefile.in
View File

@ -40,7 +40,6 @@ EXPORTS += \
$(NULL)
ifdef MOZ_WEBGL
DEFINES += -DMOZ_WEBGL
DEFINES += -DMOZ_D3DX9_DLL=$(MOZ_D3DX9_DLL)
DEFINES += -DMOZ_D3DCOMPILER_DLL=$(MOZ_D3DCOMPILER_DLL)
endif
endif

1
toolkit/mozapps/installer/signing.mk
View File

@ -17,7 +17,6 @@ SIGN_INCLUDES := \
SIGN_EXCLUDES := \
'D3DCompiler*.dll' \
'd3dx9*.dll' \
'msvc*.dll' \
$(NULL)
endif # Windows