summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelliott_c <ocielliottc@users.noreply.github.com>2005-03-08 18:59:57 +0000
committerelliott_c <ocielliottc@users.noreply.github.com>2005-03-08 18:59:57 +0000
commit38c40b3f9da2f87ad8c223b70ecd71e8885d4384 (patch)
treefce4d598bf8fe9da0812086b555e7728a34a5335
parent540a283f7c6e102cbae21aa86ed3a88c6a1bf24c (diff)
downloadMPC-38c40b3f9da2f87ad8c223b70ecd71e8885d4384.tar.gz
ChangeLogTag: Tue Mar 8 12:57:52 2005 Chad Elliott <elliott_c@ociweb.com>
-rw-r--r--ChangeLog8
-rw-r--r--templates/em3.mpd16
-rw-r--r--templates/em3vcp.mpd16
-rw-r--r--templates/vc6.mpd8
-rw-r--r--templates/vc6dsp.mpd8
5 files changed, 52 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 5f6b7b68..10b52675 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Tue Mar 8 12:57:52 2005 Chad Elliott <elliott_c@ociweb.com>
+
+ * templates/em3vcp.mpd:
+ * templates/vc6dsp.mpd:
+
+ Fixed a bug introduced Fri Mar 4 12:03:48 2005. A different /Fo
+ option is needed for each different configuration.
+
Tue Mar 8 07:21:11 2005 Chad Elliott <elliott_c@ociweb.com>
* modules/ProjectCreator.pm:
diff --git a/templates/em3.mpd b/templates/em3.mpd
index 20482f77..3a7da0cc 100644
--- a/templates/em3.mpd
+++ b/templates/em3.mpd
@@ -114,7 +114,13 @@ SOURCE="<%pch_source%>"
SOURCE="<%grouped_source_file->file%>"
<%if(dirname(grouped_source_file->file))%>
-# ADD CPP /Fo"<%intermediate_dir%>\<%noextension(project_file)%>\<%noextension(grouped_source_file->file)%>.obj"
+<%foreach(platforms)%>
+<%foreach(configurations)%>
+!<%fornotfirst("ELSE")%>IF "$(CFG)" == "<%project_name%> - <%operating_system%> (<%platform%>) <%configuration%>"
+# ADD CPP /Fo"<%intermediate_dir%>\<%noextension(project_file)%>\<%machine%>\<%noextension(grouped_source_file->file)%>.obj"
+<%endfor%>
+!ENDIF
+<%endfor%>
<%endif%>
# End Source File
<%endfor%>
@@ -126,7 +132,13 @@ SOURCE="<%grouped_source_file->file%>"
SOURCE="<%source_file%>"
<%if(dirname(source_file))%>
-# ADD CPP /Fo"<%intermediate_dir%>\<%noextension(project_file)%>\<%noextension(source_file)%>.obj"
+<%foreach(platforms)%>
+<%foreach(configurations)%>
+!<%fornotfirst("ELSE")%>IF "$(CFG)" == "<%project_name%> - <%operating_system%> (<%platform%>) <%configuration%>"
+# ADD CPP /Fo"<%intermediate_dir%>\<%noextension(project_file)%>\<%machine%>\<%noextension(source_file)%>.obj"
+<%endfor%>
+!ENDIF
+<%endfor%>
<%endif%>
# End Source File
<%endfor%>
diff --git a/templates/em3vcp.mpd b/templates/em3vcp.mpd
index 20482f77..3a7da0cc 100644
--- a/templates/em3vcp.mpd
+++ b/templates/em3vcp.mpd
@@ -114,7 +114,13 @@ SOURCE="<%pch_source%>"
SOURCE="<%grouped_source_file->file%>"
<%if(dirname(grouped_source_file->file))%>
-# ADD CPP /Fo"<%intermediate_dir%>\<%noextension(project_file)%>\<%noextension(grouped_source_file->file)%>.obj"
+<%foreach(platforms)%>
+<%foreach(configurations)%>
+!<%fornotfirst("ELSE")%>IF "$(CFG)" == "<%project_name%> - <%operating_system%> (<%platform%>) <%configuration%>"
+# ADD CPP /Fo"<%intermediate_dir%>\<%noextension(project_file)%>\<%machine%>\<%noextension(grouped_source_file->file)%>.obj"
+<%endfor%>
+!ENDIF
+<%endfor%>
<%endif%>
# End Source File
<%endfor%>
@@ -126,7 +132,13 @@ SOURCE="<%grouped_source_file->file%>"
SOURCE="<%source_file%>"
<%if(dirname(source_file))%>
-# ADD CPP /Fo"<%intermediate_dir%>\<%noextension(project_file)%>\<%noextension(source_file)%>.obj"
+<%foreach(platforms)%>
+<%foreach(configurations)%>
+!<%fornotfirst("ELSE")%>IF "$(CFG)" == "<%project_name%> - <%operating_system%> (<%platform%>) <%configuration%>"
+# ADD CPP /Fo"<%intermediate_dir%>\<%noextension(project_file)%>\<%machine%>\<%noextension(source_file)%>.obj"
+<%endfor%>
+!ENDIF
+<%endfor%>
<%endif%>
# End Source File
<%endfor%>
diff --git a/templates/vc6.mpd b/templates/vc6.mpd
index e8034495..653c3857 100644
--- a/templates/vc6.mpd
+++ b/templates/vc6.mpd
@@ -105,7 +105,11 @@ SOURCE="<%pch_source%>"
SOURCE="<%grouped_source_file->file%>"
<%if(dirname(grouped_source_file->file))%>
+<%foreach(configurations)%>
+!<%fornotfirst("ELSE")%>IF "$(CFG)" == "<%project_name%> - <%platform%> <%configuration%>"
# ADD CPP /Fo"<%intermediate_dir%>\<%noextension(project_file)%>\<%noextension(grouped_source_file->file)%>.obj"
+<%endfor%>
+!ENDIF
<%endif%>
# End Source File
<%endfor%>
@@ -117,7 +121,11 @@ SOURCE="<%grouped_source_file->file%>"
SOURCE="<%source_file%>"
<%if(dirname(source_file))%>
+<%foreach(configurations)%>
+!<%fornotfirst("ELSE")%>IF "$(CFG)" == "<%project_name%> - <%platform%> <%configuration%>"
# ADD CPP /Fo"<%intermediate_dir%>\<%noextension(project_file)%>\<%noextension(source_file)%>.obj"
+<%endfor%>
+!ENDIF
<%endif%>
# End Source File
<%endfor%>
diff --git a/templates/vc6dsp.mpd b/templates/vc6dsp.mpd
index e8034495..653c3857 100644
--- a/templates/vc6dsp.mpd
+++ b/templates/vc6dsp.mpd
@@ -105,7 +105,11 @@ SOURCE="<%pch_source%>"
SOURCE="<%grouped_source_file->file%>"
<%if(dirname(grouped_source_file->file))%>
+<%foreach(configurations)%>
+!<%fornotfirst("ELSE")%>IF "$(CFG)" == "<%project_name%> - <%platform%> <%configuration%>"
# ADD CPP /Fo"<%intermediate_dir%>\<%noextension(project_file)%>\<%noextension(grouped_source_file->file)%>.obj"
+<%endfor%>
+!ENDIF
<%endif%>
# End Source File
<%endfor%>
@@ -117,7 +121,11 @@ SOURCE="<%grouped_source_file->file%>"
SOURCE="<%source_file%>"
<%if(dirname(source_file))%>
+<%foreach(configurations)%>
+!<%fornotfirst("ELSE")%>IF "$(CFG)" == "<%project_name%> - <%platform%> <%configuration%>"
# ADD CPP /Fo"<%intermediate_dir%>\<%noextension(project_file)%>\<%noextension(source_file)%>.obj"
+<%endfor%>
+!ENDIF
<%endif%>
# End Source File
<%endfor%>