From 8b25cdd5bf149ce78ba25f17a055f848b648d6c9 Mon Sep 17 00:00:00 2001
From: Kyle Huey <khuey@kylehuey.com>
Date: Thu, 5 Jan 2012 08:45:40 -0500
Subject: [PATCH] Bug 712175: Delayload gkmedias.dll. r=glandium

---
 toolkit/library/Makefile.in | 7 +++++++
 xpcom/stub/Makefile.in      | 6 ------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in
index ee3fad65c71..fbe07c8bfa5 100644
--- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in
@@ -401,6 +401,13 @@ endif
 
 EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,gkmedias,$(DIST)/lib) 
 
+ifeq ($(OS_ARCH),WINNT)
+EXTRA_DSO_LDOPTS += \
+  delayimp.lib \
+  -DELAYLOAD:gkmedias.dll \
+  $(NULL)
+endif
+
 ifdef MOZ_SYDNEYAUDIO
 ifeq ($(OS_ARCH),Linux)
 EXTRA_DSO_LDOPTS += $(MOZ_ALSA_LIBS)
diff --git a/xpcom/stub/Makefile.in b/xpcom/stub/Makefile.in
index 696adf129df..8a5675aa37d 100644
--- a/xpcom/stub/Makefile.in
+++ b/xpcom/stub/Makefile.in
@@ -103,12 +103,6 @@ ifdef MOZ_JPROF
 DEPENDENT_LIBS_LIST += $(DLL_PREFIX)jprof$(DLL_SUFFIX)
 endif
 
-ifeq (WINNT,$(OS_TARGET))
-ifneq (,$(MOZ_SYDNEYAUDIO)$(MOZ_WEBM)$(MOZ_OGG)$(MOZ_TREMOR)$(MOZ_VORBIS))
-DEPENDENT_LIBS_LIST += $(DLL_PREFIX)gkmedias$(DLL_SUFFIX)
-endif
-endif
-
 ifeq (bundle,$(MOZ_FS_LAYOUT))
 EXTRA_DSO_LDOPTS += $(DIST)/bin/XUL
 DEPENDENT_LIBS_LIST += XUL