summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelliott_c <ocielliottc@users.noreply.github.com>2006-01-23 19:06:51 +0000
committerelliott_c <ocielliottc@users.noreply.github.com>2006-01-23 19:06:51 +0000
commit4e3f8b85909ff7af8f8596790974fa98ca529c9d (patch)
tree65d3d76edf5d289a042c528fdf88a25496f6a7d7
parenta60b0950fa172677ce5256cd019b62d121c10d1a (diff)
downloadMPC-4e3f8b85909ff7af8f8596790974fa98ca529c9d.tar.gz
ChangeLogTag: Mon Jan 23 13:05:12 2006 Chad Elliott <elliott_c@ociweb.com>
-rw-r--r--ChangeLog7
-rw-r--r--templates/nmake.mpd7
2 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 18e399b5..efd337fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Jan 23 13:05:12 2006 Chad Elliott <elliott_c@ociweb.com>
+
+ * templates/nmake.mpd:
+
+ Added a rule back in that was removed by my change on
+ Mon Jan 9 08:30:14 2006.
+
Mon Jan 23 12:08:25 2006 Chad Elliott <elliott_c@ociweb.com>
* modules/BMakeWorkspaceCreator.pm:
diff --git a/templates/nmake.mpd b/templates/nmake.mpd
index 64593013..1b1c16ec 100644
--- a/templates/nmake.mpd
+++ b/templates/nmake.mpd
@@ -247,11 +247,14 @@ CPP_SWITCHES=/nologo <%if(add_compile)%><%add_compile%> <%endif%><%if(optimize)%
<%foreach(source_files)%>
SOURCE="<%source_file%>"
-"$(INTDIR)\<%noextension(source_file)%>.obj" : $(SOURCE) "$(INTDIR)"
<%if(dirname(source_file))%>
+"$(INTDIR)\<%noextension(source_file)%>.obj" : $(SOURCE) "$(INTDIR)"
@if not exist "$(INTDIR)\<%dirname(source_file)%>\$(NULL)" mkdir "$(INTDIR)\<%dirname(source_file)%>"
-<%endif%>
$(CPP) $(CPP_COMMON) /Fo"$(INTDIR)\<%noextension(source_file)%>.obj" $(SOURCE)
+<%else%>
+"$(INTDIR)\<%basenoextension(source_file)%>.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_COMMON) /Fo"$(INTDIR)\<%basenoextension(source_file)%>.obj" $(SOURCE)
+<%endif%>
<%endfor%>
<%endif%>