Bug 717223 - Delayload linking of gkmedias.dll broke mingw compilation r=khuey
authorJacek Caban <jacek@codeweavers.com>
Thu, 12 Jan 2012 12:07:25 +0100
changeset 85562 4089da57bff1caf1da11ddaa259fd5c84649db7f
parent 85558 feba786cfdc8667873f84cb1979b4105ad7bbfac
child 85563 f357bdd35f1b6808566b94ba7dee14e4d9630719
push id805
push userakeybl@mozilla.com
push dateWed, 01 Feb 2012 18:17:35 +0000
treeherdermozilla-aurora@6fb3bf232436 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskhuey
bugs717223
milestone12.0a1
Bug 717223 - Delayload linking of gkmedias.dll broke mingw compilation r=khuey
toolkit/library/Makefile.in
--- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in
@@ -396,23 +396,16 @@ EXTRA_DSO_LDOPTS += $(MOZ_LIBEVENT_LIBS)
 endif
 
 ifdef MOZ_NATIVE_LIBVPX
 EXTRA_DSO_LDOPTS += $(MOZ_LIBVPX_LIBS)
 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)
 endif
 endif
 
 ifdef HAVE_CLOCK_MONOTONIC
 EXTRA_DSO_LDOPTS += $(REALTIME_LIBS)
@@ -560,16 +553,17 @@ ifneq (,$(MOZ_DEBUG)$(NS_TRACE_MALLOC))
 OS_LIBS += $(call EXPAND_LIBNAME,imagehlp)
 endif
 ifdef MOZ_CRASHREPORTER
 OS_LIBS += $(call EXPAND_LIBNAME,wininet)
 endif
 ifdef _MSC_VER
 OS_LIBS += $(call EXPAND_LIBNAME,delayimp)
 EXTRA_DSO_LDOPTS += \
+  -DELAYLOAD:gkmedias.dll \
   -DELAYLOAD:rasapi32.dll \
   -DELAYLOAD:rasdlg.dll \
   -DELAYLOAD:comdlg32.dll \
   -DELAYLOAD:winspool.drv \
   $(NULL)
 endif
 endif # WINNT