summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelliott_c <ocielliottc@users.noreply.github.com>2005-04-18 11:59:32 +0000
committerelliott_c <ocielliottc@users.noreply.github.com>2005-04-18 11:59:32 +0000
commit9d8ecf36e05687121477a7c932893d3fdd50be65 (patch)
tree135bee32386befcb1d760b40042c939bd8247e47
parent00ee5ba6638dfd31fa687a883a15aecbf4909ce7 (diff)
downloadMPC-9d8ecf36e05687121477a7c932893d3fdd50be65.tar.gz
ChangeLogTag: Mon Apr 18 06:56:20 2005 Chad Elliott <elliott_c@ociweb.com>
-rw-r--r--ChangeLog6
-rw-r--r--templates/nmake.mpd5
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 6a290a2c..3f9ac646 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Apr 18 06:56:20 2005 Chad Elliott <elliott_c@ociweb.com>
+
+ * templates/nmake.mpd:
+
+ Updated to work with multiple resource files.
+
Mon Apr 18 10:19:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
* templates/bmakecommon.mpt:
diff --git a/templates/nmake.mpd b/templates/nmake.mpd
index 5f8c39f1..f30866b8 100644
--- a/templates/nmake.mpd
+++ b/templates/nmake.mpd
@@ -130,9 +130,6 @@ CPP_PROJ=/nologo <%if(add_compile)%><%add_compile%> <%endif%><%if(optimize)%><%o
<%if(!type_is_static)%>
RSC=rc.exe
-<%foreach(resource_files)%>
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\<%if(dirname(resource_file))%><%noextension(resource_file)%><%else%><%basenoextension(resource_file)%><%endif%>.res"<%foreach(defines cpu_defines macros)%> /d <%define%><%endfor%><%if(unicode)%> /d UNICODE /d _UNICODE<%endif%><%foreach(includes)%> /i "<%include%>"<%endfor%>
-<%endfor%>
<%endif%>
<%if(exename || sharedname || staticname)%>
@@ -326,7 +323,7 @@ SOURCE=<%resource_file%>
<%if(dirname(resource_file))%>
@if not exist "$(INTDIR)\<%dirname(resource_file)%>\$(NULL)" mkdir "$(INTDIR)\<%dirname(resource_file)%>"
<%endif%>
- $(RSC) $(RSC_PROJ) "$(SOURCE)"
+ $(RSC) /l 0x409 /fo"$(INTDIR)\<%if(dirname(resource_file))%><%noextension(resource_file)%><%else%><%basenoextension(resource_file)%><%endif%>.res"<%foreach(defines cpu_defines macros)%> /d <%define%><%endfor%><%if(unicode)%> /d UNICODE /d _UNICODE<%endif%><%foreach(includes)%> /i "<%include%>"<%endfor%> "$(SOURCE)"
<%endfor%>