Bug 955261 - Update to Mozilla 19, Port |Bug 773143 - Rename MOZ_ANGLE to MOZ_ANGLE_RENDERER [Port |Bug 772457 Remove compile-time option to disable ANGLE, replace it by an option to disable WebGL|, r=florian.

im/installer/Makefile.in

@@ -53,6 +53,14 @@ else
 DEFINES += -DJAREXT=
 endif
 
+ifdef MOZ_ANGLE_RENDERER
+DEFINES += \
+  -DMOZ_ANGLE_RENDERER=$(MOZ_ANGLE_RENDERER) \
+  -DMOZ_D3DX9_DLL=$(MOZ_D3DX9_DLL) \
+  -DMOZ_D3DCOMPILER_DLL=$(MOZ_D3DCOMPILER_DLL) \
+	$(NULL)
+endif
+
 include $(MOZILLA_SRCDIR)/ipc/app/defs.mk
 DEFINES += -DMOZ_CHILD_PROCESS_NAME=$(MOZ_CHILD_PROCESS_NAME)
 

im/installer/package-manifest.in

@@ -93,7 +93,7 @@
 #endif
 #endif
 ; ANGLE GLES-on-D3D rendering library
-#ifdef MOZ_ANGLE
+#ifdef MOZ_ANGLE_RENDERER
 @BINPATH@/libEGL.dll
 @BINPATH@/libGLESv2.dll
 @BINPATH@/@MOZ_D3DX9_DLL@