diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2006-01-11 00:35:14 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2006-01-11 00:35:14 +0000 |
| commit | d3924d722cefb6473666107afeb535a125a556ad (patch) | |
| tree | 33746bfd989fa46171ce2c22f2828bd2c852d2ff | |
| parent | 18b0013e063fb0380e2d82ac2b485014aca560bc (diff) | |
| download | MPC-d3924d722cefb6473666107afeb535a125a556ad.tar.gz | |
ChangeLogTag:Tue Jan 10 16:30:32 2006 Ossama Othman <ossama@dre.vanderbilt.edu>
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | templates/nmake.mpd | 1 |
2 files changed, 8 insertions, 0 deletions
@@ -1,3 +1,10 @@ +Tue Jan 10 16:30:32 2006 Ossama Othman <ossama@dre.vanderbilt.edu> + + From Russell More <russell_mora at symantec dot com> + * templates/nmake.mpd: + + Add to manifest files, if `.manifest' file exists. + Mon Jan 9 08:30:14 2006 Chad Elliott <elliott_c@ociweb.com> * templates/nmake.mpd: diff --git a/templates/nmake.mpd b/templates/nmake.mpd index 29a650de..88569abe 100644 --- a/templates/nmake.mpd +++ b/templates/nmake.mpd @@ -161,6 +161,7 @@ LINK32_OBJS= \ $(LINK32) @<< $(LINK32_FLAGS) $(LINK32_OBJS) << + if exist "<%if(type_is_dynamic)%><%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%sharedname%><%lib_modifier%><%dll_ext%>.manifest<%endif%><%if(exename)%>$(INSTALLDIR)\<%exename%><%if(use_modifier)%><%lib_modifier%><%endif%><%exe_ext%>.manifest<%endif%><%if(type_is_static)%>$(OUTDIR)\<%staticname%><%lib_modifier%><%lib_ext%>.manifest<%endif%>" mt.exe -manifest "<%if(type_is_dynamic)%><%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%sharedname%><%lib_modifier%><%dll_ext%>.manifest<%endif%><%if(exename)%>$(INSTALLDIR)\<%exename%><%if(use_modifier)%><%lib_modifier%><%endif%><%exe_ext%>.manifest<%endif%><%if(type_is_static)%>$(OUTDIR)\<%staticname%><%lib_modifier%><%lib_ext%>.manifest<%endif%>" -outputresource:$@;<%if(type_is_dynamic)%>2<%endif%><%if(exename)%>1<%endif%><%if(type_is_static)%>2<%endif%> <%endif%> <%if(postbuild)%> |