summaryrefslogtreecommitdiffstats
path: root/browser
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-02-18 12:43:22 +0100
committerwolfbeast <mcwerewolf@gmail.com>2018-02-18 12:43:22 +0100
commitb6c330e1ca4baff6c98bfa94b8c3855d5afbc7cb (patch)
treec1229f5b985b4d3d5af1e8081aac463789311281 /browser
parent51b6354f31b5f2122c11afec7fc0e3d650ce5e5d (diff)
downloadUXP-b6c330e1ca4baff6c98bfa94b8c3855d5afbc7cb.tar
UXP-b6c330e1ca4baff6c98bfa94b8c3855d5afbc7cb.tar.gz
UXP-b6c330e1ca4baff6c98bfa94b8c3855d5afbc7cb.tar.lz
UXP-b6c330e1ca4baff6c98bfa94b8c3855d5afbc7cb.tar.xz
UXP-b6c330e1ca4baff6c98bfa94b8c3855d5afbc7cb.zip
Stop shipping d3dcompiler_43.dll
Diffstat (limited to 'browser')
-rw-r--r--browser/config/mozconfigs/win32/common-opt1
-rw-r--r--browser/config/mozconfigs/win32/debug1
-rw-r--r--browser/installer/Makefile.in3
-rw-r--r--browser/installer/package-manifest.in4
4 files changed, 0 insertions, 9 deletions
diff --git a/browser/config/mozconfigs/win32/common-opt b/browser/config/mozconfigs/win32/common-opt
index d43a9878b..816c8926a 100644
--- a/browser/config/mozconfigs/win32/common-opt
+++ b/browser/config/mozconfigs/win32/common-opt
@@ -4,7 +4,6 @@
ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
ac_add_options --enable-jemalloc
-ac_add_options --enable-require-all-d3dc-versions
if [ -f /c/builds/gapi.data ]; then
_gapi_keyfile=c:/builds/gapi.data
diff --git a/browser/config/mozconfigs/win32/debug b/browser/config/mozconfigs/win32/debug
index 6beee93c2..815276d0f 100644
--- a/browser/config/mozconfigs/win32/debug
+++ b/browser/config/mozconfigs/win32/debug
@@ -6,7 +6,6 @@ ac_add_options --enable-debug
ac_add_options --enable-dmd
ac_add_options --enable-profiling # needed for --enable-dmd to work on Windows
ac_add_options --enable-verify-mar
-ac_add_options --enable-require-all-d3dc-versions
# Needed to enable breakpad in application.ini
export MOZILLA_OFFICIAL=1
diff --git a/browser/installer/Makefile.in b/browser/installer/Makefile.in
index 55df797ef..ccfce3cd9 100644
--- a/browser/installer/Makefile.in
+++ b/browser/installer/Makefile.in
@@ -61,9 +61,6 @@ DEFINES += -DMOZ_ANGLE_RENDERER=$(MOZ_ANGLE_RENDERER)
ifdef MOZ_D3DCOMPILER_VISTA_DLL
DEFINES += -DMOZ_D3DCOMPILER_VISTA_DLL=$(MOZ_D3DCOMPILER_VISTA_DLL)
endif
-ifdef MOZ_D3DCOMPILER_XP_DLL
-DEFINES += -DMOZ_D3DCOMPILER_XP_DLL=$(MOZ_D3DCOMPILER_XP_DLL)
-endif
endif
DEFINES += -DMOZ_CHILD_PROCESS_NAME=$(MOZ_CHILD_PROCESS_NAME)
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index bddca2f29..c2269c069 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -607,10 +607,6 @@
#ifdef MOZ_D3DCOMPILER_VISTA_DLL
@BINPATH@/@MOZ_D3DCOMPILER_VISTA_DLL@
#endif
-
-#ifdef MOZ_D3DCOMPILER_XP_DLL
-@BINPATH@/@MOZ_D3DCOMPILER_XP_DLL@
-#endif
#endif # MOZ_ANGLE_RENDERER
; [Browser Chrome Files]