oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Support for merging application manifest

Browse Source
This commit is contained in:
Asanka C. Herath
2010-10-01 13:32:28 -04:00
parent ba6c36b0d7
commit 8d36e7dfcc
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
windows/NTMakefile.w32
View File

@@ -433,6 +433,12 @@ _VC_MANIFEST_EMBED_EXE_NOHEIM= \
_VC_MANIFEST_EMBED_DLL= \ _VC_MANIFEST_EMBED_DLL= \
( if exist $@.manifest $(MT) -outputresource:$@;2 -manifest $@.manifest ) ( if exist $@.manifest $(MT) -outputresource:$@;2 -manifest $@.manifest )
_MERGE_MANIFEST_DLL= \
( $(MT) -inputresource:$@;2 -manifest $(APPMANIFEST) -outputresource:$@;2 )
_INSERT_APPMANIFEST_DLL= \
( $(MT) -manifest $(APPMANIFEST) -outputresource:$@;2 )
# Note that if you are merging manifests, then the VS generated # Note that if you are merging manifests, then the VS generated
# manifest should be cleaned up after calling _VC_MANIFEST_EMBED_???. # manifest should be cleaned up after calling _VC_MANIFEST_EMBED_???.
# This ensures that even if the DLL or EXE is executed in-place, the # This ensures that even if the DLL or EXE is executed in-place, the
@@ -492,6 +498,9 @@ DLLPREP=\
DLLPREP_NODIST=\ DLLPREP_NODIST=\
( $(_VC_MANIFEST_EMBED_DLL) && $(_VC_MANIFEST_CLEAN) ) || ( $(RM) $@ && exit /b 1 ) ( $(_VC_MANIFEST_EMBED_DLL) && $(_VC_MANIFEST_CLEAN) ) || ( $(RM) $@ && exit /b 1 )
DLLPREP_MERGE=\
( ( $(_MERGE_MANIFEST_DLL) || $(_INSERT_APPMANIFEST_DLL) ) && $(_CODESIGN) ) || ( $(RM) $@ && exit /b 1 )
#---------------------------------------------------------------------- #----------------------------------------------------------------------
# Convenience macros for import libraries and assemblies # Convenience macros for import libraries and assemblies
# #