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

Windows: Include manifest dependencies by default when building tools

Browse Source
This commit is contained in:
Asanka C. Herath
2010-09-27 16:07:49 -04:00
parent f1e276cc20
commit 1b32efe62c
4 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
windows/NTMakefile.w32
View File

@@ -425,6 +425,9 @@ clean::
MT=mt.exe -nologo
_VC_MANIFEST_EMBED_EXE= \
( if exist $@.manifest $(MT) -outputresource:$@;1 -manifest $@.manifest $(APPMANIFEST) )
_VC_MANIFEST_EMBED_EXE_NOHEIM= \
( if exist $@.manifest $(MT) -outputresource:$@;1 -manifest $@.manifest )
_VC_MANIFEST_EMBED_DLL= \
@@ -475,16 +478,19 @@ _CODESIGN=( echo Skipping code sign )
# prepare binaries.
EXEPREP=\
( $(_VC_MANIFEST_EMBED_EXE) && $(_VC_MANIFEST_CLEAN) && $(_CODESIGN) ) || $(RM) $@
( $(_VC_MANIFEST_EMBED_EXE) && $(_VC_MANIFEST_CLEAN) && $(_CODESIGN) ) || ( $(RM) $@ && exit /b 1 )
EXEPREP_NOHEIM=\
( $(_VC_MANIFEST_EMBED_EXE_NOHEIM) && $(_VC_MANIFEST_CLEAN) && $(_CODESIGN) ) || ( $(RM) $@ && exit /b 1 )
EXEPREP_NODIST=\
( $(_VC_MANIFEST_EMBED_EXE) && $(_VC_MANIFEST_CLEAN) ) || $(RM) $@
( $(_VC_MANIFEST_EMBED_EXE_NOHEIM) && $(_VC_MANIFEST_CLEAN) ) || ( $(RM) $@ && exit /b 1 )
DLLPREP=\
( $(_VC_MANIFEST_EMBED_DLL) && $(_VC_MANIFEST_CLEAN) && $(_CODESIGN) ) || $(RM) $@
( $(_VC_MANIFEST_EMBED_DLL) && $(_VC_MANIFEST_CLEAN) && $(_CODESIGN) ) || ( $(RM) $@ && exit /b 1 )
DLLPREP_NODIST=\
( $(_VC_MANIFEST_EMBED_DLL) && $(_VC_MANIFEST_CLEAN) ) || $(RM) $@
( $(_VC_MANIFEST_EMBED_DLL) && $(_VC_MANIFEST_CLEAN) ) || ( $(RM) $@ && exit /b 1 )
#----------------------------------------------------------------------
# Convenience macros for import libraries and assemblies