Fix Windows bustage. Port bug 999260 to comm-central im/. r=florian over IRC
authorPatrick Cloke <clokep@gmail.com>
Tue, 06 May 2014 11:42:24 -0400
changeset 16168 3901e35cec72
parent 16167 459b1b91a901
child 16169 2a377e4fb599
push id10108
push userclokep@gmail.com
push dateTue, 06 May 2014 15:42:44 +0000
treeherdercomm-central@3901e35cec72 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersflorian
bugs999260
Fix Windows bustage. Port bug 999260 to comm-central im/. r=florian over IRC
im/config/mozconfigs/win32/mozconfig
im/config/mozconfigs/win32/mozconfig-release
im/installer/Makefile.in
im/installer/package-manifest.in
--- a/im/config/mozconfigs/win32/mozconfig
+++ b/im/config/mozconfigs/win32/mozconfig
@@ -11,14 +11,15 @@ export MOZ_DEBUG_SYMBOLS=1
 
 ac_add_options --enable-application=im
 ac_add_options --enable-extensions=purple
 ac_add_options --enable-update-channel=nightly
 ac_add_options --enable-optimize
 ac_add_options --disable-debug
 # The Windows 8 SDK is required for gamepad support.
 ac_add_options --disable-gamepad
+ac_add_options --enable-require-all-d3dc-versions
 ac_add_options --enable-update-packaging
 ac_add_options --enable-jemalloc
 
 if [ `date +%m%d` = 1031 -o `date +%m%d` = 1101 ]; then
 ac_add_options --with-branding=instantbird/branding/halloween
 fi
--- a/im/config/mozconfigs/win32/mozconfig-release
+++ b/im/config/mozconfigs/win32/mozconfig-release
@@ -11,12 +11,13 @@ export MOZ_DEBUG_SYMBOLS=1
 
 ac_add_options --enable-application=im
 ac_add_options --enable-extensions=purple
 ac_add_options --enable-update-channel=release
 ac_add_options --enable-optimize
 ac_add_options --disable-debug
 # The Windows 8 SDK is required for gamepad support.
 ac_add_options --disable-gamepad
+ac_add_options --enable-require-all-d3dc-versions
 ac_add_options --enable-update-packaging
 ac_add_options --enable-jemalloc
 ac_add_options --enable-official-branding
 ac_add_options --with-l10n-base=..
--- a/im/installer/Makefile.in
+++ b/im/installer/Makefile.in
@@ -45,17 +45,18 @@ 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_D3DCOMPILER_DLL=$(MOZ_D3DCOMPILER_DLL)
+DEFINES += -DMOZ_D3DCOMPILER_VISTA_DLL=$(MOZ_D3DCOMPILER_VISTA_DLL)
+DEFINES += -DMOZ_D3DCOMPILER_XP_DLL=$(MOZ_D3DCOMPILER_XP_DLL)
 endif
 
 ifdef MOZ_UPDATER
 DEFINES += -DMOZ_UPDATER=1
 endif
 
 ifdef MOZ_NATIVE_NSPR
 DEFINES += -DMOZ_NATIVE_NSPR=1
--- a/im/installer/package-manifest.in
+++ b/im/installer/package-manifest.in
@@ -92,19 +92,27 @@
 @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_D3DCOMPILER_DLL@
+
+#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
+
 ; Modules
 @BINPATH@/modules/*
 
 [instantbird]
 #ifndef XP_UNIX
 @BINPATH@/@MOZ_APP_NAME@.exe
 #else
 @BINPATH@/@MOZ_APP_NAME@-bin