diff options
| author | Gpower2 <arslanoglou.georgios@gmail.com> | 2016-10-07 12:11:48 +0300 |
|---|---|---|
| committer | Gpower2 <arslanoglou.georgios@gmail.com> | 2016-10-07 12:11:48 +0300 |
| commit | 8fc29168af14ed8c1e91ae4697f5506e1509ccbf (patch) | |
| tree | c3dc89957605cb7ecbb04bc601abe43e46902c8a /gfx | |
| parent | 16d18d843fdbab5ba812b7e4db31ce235579a3f7 (diff) | |
| download | palemoon-gre-8fc29168af14ed8c1e91ae4697f5506e1509ccbf.tar.gz | |
Remove d3dcompiler_43 from build system
- Remove MOZ_FOUND_BOTH_D3D_COMPILERS and MOZ_REQUIRE_ALL_D3DCS
- Remove --enable-require-all-d3dc-versions , require-all-d3dc-versions
and --enable-require-all-d3dc-versions
- Remove MOZ_D3DCOMPILER_XP_DLL, MOZ_D3DCOMPILER_XP_CAB and
DMOZ_D3DCOMPILER_XP_DLL
Diffstat (limited to 'gfx')
| -rw-r--r-- | gfx/angle/Makefile.in | 4 | ||||
| -rw-r--r-- | gfx/gl/GLLibraryEGL.cpp | 5 | ||||
| -rw-r--r-- | gfx/gl/moz.build | 2 |
3 files changed, 0 insertions, 11 deletions
diff --git a/gfx/angle/Makefile.in b/gfx/angle/Makefile.in index da63a55ca..0394b352b 100644 --- a/gfx/angle/Makefile.in +++ b/gfx/angle/Makefile.in @@ -9,10 +9,6 @@ ifdef MOZ_D3DCOMPILER_VISTA_DLL_PATH cp -fp "$(MOZ_D3DCOMPILER_VISTA_DLL_PATH)" "$(DIST)/bin" endif -ifdef MOZ_D3DCOMPILER_XP_CAB - expand '$(MOZ_D3DCOMPILER_XP_CAB)' -F:$(MOZ_D3DCOMPILER_XP_DLL) '$(DIST)/bin' -endif - endif include $(topsrcdir)/config/rules.mk diff --git a/gfx/gl/GLLibraryEGL.cpp b/gfx/gl/GLLibraryEGL.cpp index 0607dd4b7..461dcd01b 100644 --- a/gfx/gl/GLLibraryEGL.cpp +++ b/gfx/gl/GLLibraryEGL.cpp @@ -146,11 +146,6 @@ GLLibraryEGL::EnsureInitialized() break; #endif -#ifdef MOZ_D3DCOMPILER_XP_DLL - if (LoadLibraryForEGLOnWindows(NS_LITERAL_STRING(NS_STRINGIFY(MOZ_D3DCOMPILER_XP_DLL)))) - break; -#endif - MOZ_ASSERT(false, "d3dcompiler DLL loading failed."); } while (false); diff --git a/gfx/gl/moz.build b/gfx/gl/moz.build index be9c3e584..72e6dc155 100644 --- a/gfx/gl/moz.build +++ b/gfx/gl/moz.build @@ -150,8 +150,6 @@ FINAL_LIBRARY = 'xul' if CONFIG['MOZ_D3DCOMPILER_VISTA_DLL']: DEFINES['MOZ_D3DCOMPILER_VISTA_DLL'] = CONFIG['MOZ_D3DCOMPILER_VISTA_DLL'] -if CONFIG['MOZ_D3DCOMPILER_XP_DLL']: - DEFINES['MOZ_D3DCOMPILER_XP_DLL'] = CONFIG['MOZ_D3DCOMPILER_XP_DLL'] CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS'] CXXFLAGS += CONFIG['TK_CFLAGS'] |