mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-09 03:15:11 +00:00
bug 350616 - embed manifests in all DLLs when building. r+a=bsmedberg
This commit is contained in:
parent
16e172301d
commit
36858dc9bf
@ -99,8 +99,6 @@ MIDL_GENERATED_FILES = \
|
||||
$(MIDL_ENUMS:%.idl=%.h) \
|
||||
$(NULL)
|
||||
|
||||
EMBED_MANIFEST_AT = 2
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
OS_LIBS = \
|
||||
|
@ -119,7 +119,5 @@ export:: done_gen
|
||||
register::
|
||||
regsvr32 -s $(DIST)/bin/$(SHARED_LIBRARY)
|
||||
|
||||
EMBED_MANIFEST_AT = 2
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
@ -1069,12 +1069,10 @@ endif # NO_LD_ARCHIVE_FLAGS
|
||||
$(MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(LOBJS) $(SUB_SHLOBJS) $(RESFILE) $(LDFLAGS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE) $(SHLIB_LDENDFILE)
|
||||
ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
|
||||
ifdef MSMANIFEST_TOOL
|
||||
ifdef EMBED_MANIFEST_AT
|
||||
@if test -f $@.manifest; then \
|
||||
mt.exe -NOLOGO -MANIFEST $@.manifest -OUTPUTRESOURCE:$@\;$(EMBED_MANIFEST_AT); \
|
||||
mt.exe -NOLOGO -MANIFEST $@.manifest -OUTPUTRESOURCE:$@\;2; \
|
||||
rm -f $@.manifest; \
|
||||
fi
|
||||
endif # embed manifest
|
||||
endif # MSVC with manifest tool
|
||||
endif # WINNT && !GCC
|
||||
ifeq ($(OS_ARCH),Darwin)
|
||||
|
@ -114,8 +114,6 @@ GARBAGE += $(DEFFILE) $(MIDL_GENERATED_FILES) done_gen
|
||||
|
||||
ENABLE_CXX_EXCEPTIONS = 1
|
||||
|
||||
EMBED_MANIFEST_AT = 2
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
CXXFLAGS += -D "WIN32" -U "ClientWallet"
|
||||
|
@ -64,8 +64,6 @@ OS_LIBS += \
|
||||
|
||||
ENABLE_CXX_EXCEPTIONS = 1
|
||||
|
||||
EMBED_MANIFEST_AT = 2
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
CXXFLAGS += -D "WIN32" -GF -MT -O1
|
||||
|
@ -67,5 +67,4 @@ EXTRA_DSO_LDOPTS= \
|
||||
$(MOZ_COMPONENT_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
EMBED_MANIFEST_AT = 17
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
Loading…
Reference in New Issue
Block a user