Bug 712175: Delayload gkmedias.dll. r=glandium

This commit is contained in:
Kyle Huey 2012-01-05 08:45:40 -05:00
parent a58d81faef
commit 8e3b7a1d97
2 changed files with 7 additions and 6 deletions

View File

@ -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)

View File

@ -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