diff options
| author | elliott_c <ocielliottc@users.noreply.github.com> | 2003-03-19 13:28:48 +0000 |
|---|---|---|
| committer | elliott_c <ocielliottc@users.noreply.github.com> | 2003-03-19 13:28:48 +0000 |
| commit | 7e339e918399edaf05939fb5db7e58d9f2f5f9d3 (patch) | |
| tree | af936622440eb64c24c9a546c77e0f9e3e5b933a | |
| parent | 14adcb64d4ef1c8edcbc01043b21b12c102fd3d7 (diff) | |
| download | MPC-7e339e918399edaf05939fb5db7e58d9f2f5f9d3.tar.gz | |
ChangeLogTag: Wed Mar 19 07:27:59 2003 Chad Elliott <elliott_c@ociweb.com>
| -rw-r--r-- | modules/NMakeWorkspaceCreator.pm | 12 | ||||
| -rw-r--r-- | templates/nmake.mpd | 13 |
2 files changed, 18 insertions, 7 deletions
diff --git a/modules/NMakeWorkspaceCreator.pm b/modules/NMakeWorkspaceCreator.pm index e36fd397..553edfce 100644 --- a/modules/NMakeWorkspaceCreator.pm +++ b/modules/NMakeWorkspaceCreator.pm @@ -107,13 +107,13 @@ sub write_comps { 'CFG=' . $default . $crlf . '!MESSAGE No configuration specified. ' . 'Defaulting to ' . $default . '.' . $crlf . - '!ENDIF' . $crlf . $crlf . - 'ALL:' . $crlf; - $self->write_project_targets($fh, 'CFG="$(CFG)"', \@list); + '!ENDIF' . $crlf; - print $fh "$crlf" . - "CLEAN\tREALCLEAN:$crlf"; - $self->write_project_targets($fh, 'CLEAN', \@list); + foreach my $target ('ALL', 'DEPEND', 'IDL_STUBS', 'CLEAN', 'REALCLEAN') { + print $fh $crlf . + $target . ':' . $crlf; + $self->write_project_targets($fh, 'CFG="$(CFG)" ' . $target, \@list); + } } diff --git a/templates/nmake.mpd b/templates/nmake.mpd index b7dc07db..fa2f859d 100644 --- a/templates/nmake.mpd +++ b/templates/nmake.mpd @@ -50,15 +50,23 @@ INTDIR=<%intermediate_dir%>\<%noextension(project_file)%> ALL : <%if(exename)%><%if(install)%>"$(INSTALLDIR)" <%endif%><%endif%>"<%if(type_is_dynamic)%><%dllout%>\<%sharedname%><%lib_modifier%>.dll<%endif%><%if(type_is_static)%>$(OUTDIR)\<%staticname%><%lib_modifier%>.lib<%endif%><%if(exename)%>$(INSTALLDIR)\<%exename%>.exe<%endif%>" +DEPEND : + depgen.pl<%foreach(includes)%> -I"<%include%>"<%endfor%><%foreach(defines cpu_defines common_defines)%> -D<%define%>=1<%endfor%><%if(type_is_dynamic)%><%foreach(dllflags)%> -D<%dllflag%>=1<%endfor%><%endif%><%if(need_libflags)%><%foreach(libflags)%> -D<%libflag%>=1<%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%> -D<%pch_define%>=1<%endfor%><%endif%> -f "<%noextension(project_file)%>.dep"<%foreach(source_files)%> <%source_file%><%endfor%> +<%if(idl_files)%> +IDL_STUBS :<%foreach(idl_files)%> "<%if(flag_overrides(idl_file, idlgendir))%><%flag_overrides(idl_file, idlgendir)%><%else%><%if(idlgendir)%><%idlgendir%><%else%><%dirname(idl_file)%><%endif%><%endif%>\<%basenoextension(idl_file)%>C.cpp"<%endfor%> + +<%endif%> CLEAN : -@erase "$(INTDIR)\*.obj" -@erase "$(INTDIR)\*.res" -@erase "$(INTDIR)\*.pch" -@erase "$(INTDIR)\*.idb" -@erase "$(OUTDIR)\*.exp" - -@erase "$(OUTDIR)\*.lib" -@erase "$(OUTDIR)\*.ilk" + +REALCLEAN : CLEAN + -@erase "$(OUTDIR)\*.lib" <%if(pdb)%> <%if(exename)%> -@erase "$(INSTALLDIR)\<%exename%>.pdb" @@ -71,6 +79,9 @@ CLEAN : <%endif%> <%endif%> -@erase "<%if(type_is_dynamic)%><%dllout%>\<%sharedname%><%lib_modifier%>.dll<%endif%><%if(type_is_static)%>$(OUTDIR)\<%staticname%><%lib_modifier%>.lib<%endif%><%if(exename)%>$(INSTALLDIR)\<%exename%>.exe<%endif%>" +<%if(idl_files)%> + -@erase<%foreach(idl_files)%> "<%if(flag_overrides(idl_file, idlgendir))%><%flag_overrides(idl_file, idlgendir)%><%else%><%if(idlgendir)%><%idlgendir%><%else%><%dirname(idl_file)%><%endif%><%endif%>\<%basenoextension(idl_file)%>C.*" "<%if(flag_overrides(idl_file, idlgendir))%><%flag_overrides(idl_file, idlgendir)%><%else%><%if(idlgendir)%><%idlgendir%><%else%><%dirname(idl_file)%><%endif%><%endif%>\<%basenoextension(idl_file)%>S.*"<%endfor%> +<%endif%> <%if(install)%> "$(INSTALLDIR)" : |