diff options
| author | elliott_c <ocielliottc@users.noreply.github.com> | 2005-11-14 18:07:05 +0000 |
|---|---|---|
| committer | elliott_c <ocielliottc@users.noreply.github.com> | 2005-11-14 18:07:05 +0000 |
| commit | 8ac265c494ce6bc37f50aa9846f4a2f090e3ddba (patch) | |
| tree | 9fd0af4fd79e5abc5d76014be8cd3e922a3a2a3d | |
| parent | 79517156194b01e9f60e8b5217d2b4eaf1aabcbe (diff) | |
| download | MPC-8ac265c494ce6bc37f50aa9846f4a2f090e3ddba.tar.gz | |
ChangeLogTag: Mon Nov 14 12:06:15 2005 Chad Elliott <elliott_c@ociweb.com>
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | templates/nmake.mpd | 12 |
2 files changed, 14 insertions, 6 deletions
@@ -1,3 +1,11 @@ +Mon Nov 14 12:06:15 2005 Chad Elliott <elliott_c@ociweb.com> + + * templates/nmake.mpd: + + Corrected a problem in the realclean target where .dll, .lib and + .exp files would not be deleted unless pdbc or pdbl template + variables were defined. + Mon Nov 14 09:50:38 2005 Chad Elliott <elliott_c@ociweb.com> * modules/WorkspaceCreator.pm: diff --git a/templates/nmake.mpd b/templates/nmake.mpd index 1356c37a..433bf66c 100644 --- a/templates/nmake.mpd +++ b/templates/nmake.mpd @@ -83,19 +83,22 @@ DEPEND : !ENDIF REALCLEAN : CLEAN -<%if(pdbl)%> -<%if(exename)%> +<%if(pdbl && exename)%> -@del /f/q "$(INSTALLDIR)\<%exename%><%if(use_exe_modifier)%><%lib_modifier%><%endif%>.pdb" <%endif%> <%if(sharedname && type_is_dynamic)%> +<%if(pdbl)%> -@del /f/q "$(OUTDIR)\<%libname_prefix%><%sharedname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%>.pdb" +<%endif%> -@del /f/q "<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%libname_prefix%><%sharedname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%dll_ext%>" -@del /f/q "$(OUTDIR)\<%libname_prefix%><%sharedname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%lib_ext%>" -@del /f/q "$(OUTDIR)\<%libname_prefix%><%sharedname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%>.exp" -@del /f/q "$(OUTDIR)\<%libname_prefix%><%sharedname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%>.ilk" <%else%> <%if(staticname && type_is_dynamic)%> +<%if(pdbl || pdbc)%> -@del /f/q "$(OUTDIR)\<%libname_prefix%><%staticname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%>.pdb" +<%endif%> -@del /f/q "<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%libname_prefix%><%staticname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%dll_ext%>" <%endif%> <%endif%> @@ -104,12 +107,9 @@ REALCLEAN : CLEAN -@del /f/q "$(OUTDIR)\<%libname_prefix%><%staticname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%>.exp" -@del /f/q "$(OUTDIR)\<%libname_prefix%><%staticname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%>.ilk" <%endif%> -<%endif%> -<%if(pdbc)%> -<%if(type_is_static)%> +<%if(pdbc && type_is_static)%> -@del /f/q "<%libout%>\<%libname_prefix%><%staticname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%>.pdb" <%endif%> -<%endif%> <%if(exename)%> -@del /f/q "$(INSTALLDIR)\<%exename%><%if(use_exe_modifier)%><%lib_modifier%><%endif%><%exe_ext%>" -@del /f/q "$(INSTALLDIR)\<%exename%><%if(use_exe_modifier)%><%lib_modifier%><%endif%>.ilk" |