Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 03:15:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug 350616 - embed manifests in all DLLs when building. r+a=bsmedberg

Browse Source
This commit is contained in:
ted.mielczarek@gmail.com 2007-08-28 10:38:02 -07:00
parent 16e172301d
commit 36858dc9bf
6 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
accessible/public/ia2/Makefile.in
View File

@ -99,8 +99,6 @@ MIDL_GENERATED_FILES = \
$(MIDL_ENUMS:%.idl=%.h) \ $(MIDL_ENUMS:%.idl=%.h) \
$(NULL) $(NULL)
EMBED_MANIFEST_AT = 2
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk
OS_LIBS = \ OS_LIBS = \

2
accessible/public/msaa/Makefile.in
View File

@ -119,7 +119,5 @@ export:: done_gen
register:: register::
regsvr32 -s $(DIST)/bin/$(SHARED_LIBRARY) regsvr32 -s $(DIST)/bin/$(SHARED_LIBRARY)
EMBED_MANIFEST_AT = 2
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk

4
config/rules.mk
View File

@ -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) $(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)) ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
ifdef MSMANIFEST_TOOL ifdef MSMANIFEST_TOOL
ifdef EMBED_MANIFEST_AT
@if test -f $@.manifest; then \ @if test -f $@.manifest; then \
mt.exe -NOLOGO -MANIFEST $@.manifest -OUTPUTRESOURCE:$@\;$(EMBED_MANIFEST_AT); \ mt.exe -NOLOGO -MANIFEST $@.manifest -OUTPUTRESOURCE:$@\;2; \
rm -f $@.manifest; \ rm -f $@.manifest; \
fi fi
endif # embed manifest
endif # MSVC with manifest tool endif # MSVC with manifest tool
endif # WINNT && !GCC endif # WINNT && !GCC
ifeq ($(OS_ARCH),Darwin) ifeq ($(OS_ARCH),Darwin)

2
embedding/browser/activex/src/control/Makefile.in
View File

@ -114,8 +114,6 @@ GARBAGE += $(DEFFILE) $(MIDL_GENERATED_FILES) done_gen
ENABLE_CXX_EXCEPTIONS = 1 ENABLE_CXX_EXCEPTIONS = 1
EMBED_MANIFEST_AT = 2
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk
CXXFLAGS += -D "WIN32" -U "ClientWallet" CXXFLAGS += -D "WIN32" -U "ClientWallet"

2
embedding/browser/activex/src/control_kicker/Makefile.in
View File

@ -64,8 +64,6 @@ OS_LIBS += \
ENABLE_CXX_EXCEPTIONS = 1 ENABLE_CXX_EXCEPTIONS = 1
EMBED_MANIFEST_AT = 2
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk
CXXFLAGS += -D "WIN32" -GF -MT -O1 CXXFLAGS += -D "WIN32" -GF -MT -O1

1
xpinstall/stub/Makefile.in
View File

@ -67,5 +67,4 @@ EXTRA_DSO_LDOPTS= \
$(MOZ_COMPONENT_LIBS) \ $(MOZ_COMPONENT_LIBS) \
$(NULL) $(NULL)
EMBED_MANIFEST_AT = 17
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk