зеркало из https://github.com/mozilla/pjs.git
Bug 740919 - Don't delay-load gkmedias.dll and make the XPCOM glue work by eagerly loading it in dependentlibs.list, r=khuey
--HG-- extra : rebase_source : cb2c83a5ca23c4ed93b18622503efc834c4465c4
This commit is contained in:
Родитель
fcab0d003a
Коммит
e79ae925de
|
@ -532,7 +532,6 @@ endif
|
|||
ifdef _MSC_VER
|
||||
OS_LIBS += $(call EXPAND_LIBNAME,delayimp)
|
||||
EXTRA_DSO_LDOPTS += \
|
||||
-DELAYLOAD:gkmedias.dll \
|
||||
-DELAYLOAD:psapi.dll \
|
||||
-DELAYLOAD:dbghelp.dll \
|
||||
-DELAYLOAD:rasapi32.dll \
|
||||
|
|
|
@ -100,6 +100,10 @@ DEPENDENT_LIBS_LIST += \
|
|||
$(DLL_PREFIX)smime3$(DLL_SUFFIX) \
|
||||
$(NULL)
|
||||
|
||||
ifeq (WINNT,$(OS_TARGET))
|
||||
DEPENDENT_LIBS_LIBS += $(DLL_PREFIX)gkmedias$(DLL_SUFFIX)
|
||||
endif
|
||||
|
||||
ifdef JS_SHARED_LIBRARY
|
||||
DEPENDENT_LIBS_LIST += $(DLL_PREFIX)mozjs$(DLL_SUFFIX)
|
||||
endif
|
||||
|
|
Загрузка…
Ссылка в новой задаче