summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Mitz <mitza-oci@users.noreply.github.com>2010-08-18 21:42:04 +0000
committerAdam Mitz <mitza-oci@users.noreply.github.com>2010-08-18 21:42:04 +0000
commitd68428239fae088960fa87110e3b6072a8f69e38 (patch)
treecd39bbf3bde114faac590b4830b5defc64ebd979
parentb1aa34d8e944c1720b1898d226d70d31637463d8 (diff)
downloadMPC-d68428239fae088960fa87110e3b6072a8f69e38.tar.gz
ChangeLogTag: Wed Aug 18 21:39:36 UTC 2010 Adam Mitz <mitza@ociweb.com>
-rw-r--r--ChangeLog12
-rw-r--r--config/mfc.mpb3
-rw-r--r--templates/vc10.mpd6
3 files changed, 18 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 24ca379b..9eff73e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Wed Aug 18 21:39:36 UTC 2010 Adam Mitz <mitza@ociweb.com>
+
+ * config/mfc.mpb:
+
+ The "subsystem" template variable is a string for vc10 (not an int).
+
+ * templates/vc10.mpd:
+
+ The pch_header can't be listed separately from the other headers
+ because unlike earlier versions the same file can't appear twice.
+ Added the midl_flags template variable to work like vc8/vc9.
+
Wed Aug 18 16:10:32 UTC 2010 Adam Mitz <mitza@ociweb.com>
* modules/ProjectCreator.pm (need_to_write_project):
diff --git a/config/mfc.mpb b/config/mfc.mpb
index 7f8a8f2e..145832cd 100644
--- a/config/mfc.mpb
+++ b/config/mfc.mpb
@@ -9,6 +9,9 @@ project {
} else {
subsystem = 2
}
+ specific(vc10) {
+ subsystem = Windows
+ }
specific {
use_mfc = 2
unicode_mfc_entry = wWinMainCRTStartup
diff --git a/templates/vc10.mpd b/templates/vc10.mpd
index 8a2e3a13..efe150c9 100644
--- a/templates/vc10.mpd
+++ b/templates/vc10.mpd
@@ -118,6 +118,9 @@
<HeaderFileName>%(Filename).h</HeaderFileName>
<InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
<ProxyFileName>%(Filename)_p.c</ProxyFileName>
+<%if(midl_flags)%>
+ <AdditionalOptions><%midl_flags%></AdditionalOptions>
+<%endif%>
</Midl>
<ClCompile>
<Optimization><%optimize("Disabled")%></Optimization>
@@ -753,9 +756,6 @@
<%endif%>
<%if(header_files)%>
<ItemGroup>
-<%if(pch_header)%>
- <ClInclude Include="<%pch_header%>" />
-<%endif%>
<%foreach(header_files)%>
<ClInclude Include="<%header_file%>" />
<%endfor%>