summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--docs/templates/vc10.txt1
-rw-r--r--templates/vc10.mpd2
3 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e101c283..09259062 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Fri May 23 19:11:37 UTC 2014 Chad Elliott <elliott_c@ociweb.com>
+
+ * docs/templates/vc10.txt:
+ * templates/vc10.mpd:
+
+ Modified to allow the setting of the TargetFrameworkVersion to
+ change the TargetFrameworkVersion of managed C++ projects. Thanks
+ to Charles Calkins <calkinsc at ociweb dot com> for bringing this
+ to my attention.
+
Tue May 6 12:32:53 UTC 2014 Chad Elliott <elliott_c@ociweb.com>
* docs/templates/vc10.txt:
diff --git a/docs/templates/vc10.txt b/docs/templates/vc10.txt
index 617149cb..6cc0f247 100644
--- a/docs/templates/vc10.txt
+++ b/docs/templates/vc10.txt
@@ -152,6 +152,7 @@ supportunloadofdelayloadeddll = The UNLOAD qualifier tells the delay-load helper
suppressstartupbanner = Compiler and linker option that prevents display of the copyright message and version number.
swaprunfromcd = Tells the operating system to first copy the linker output to a swap file, and then run the image from there. This is a Windows NT 4.0 (and later) feature. When CD is specified, the operating system will copy the image on a removable disk to a page file and then load it.
swaprunfromnet = Tells the operating system to first copy the linker output to a swap file, and then run the image from there. This is a Windows NT 4.0 (and later) feature. If it is specified, the operating system will first copy the binary image from the network to a swap file and load it from there. This option is useful for running applications over the network.
+targetframeworkversion = The TargetFrameworkVersion attribute.
targetmachine = Specifies the subsystem for the linker. See vc10platforms.mpt for some of the settings.
terminalserveraware = Sets a flag in the IMAGE_OPTIONAL_HEADER DllCharacteristics field in the program image's optional header. When this flag is set, Terminal Server will not make certain changes to the application.
toolsversion = Override the value of the ToolsVersion attribute of the Project XML element in the vcxproj file.
diff --git a/templates/vc10.mpd b/templates/vc10.mpd
index 8b658d1a..7c23e834 100644
--- a/templates/vc10.mpd
+++ b/templates/vc10.mpd
@@ -16,7 +16,7 @@
<RootNamespace><%project_name%></RootNamespace>
<%if(managed)%>
<Keyword>ManagedCProj</Keyword>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v<%TargetFrameworkVersion("4.0")%></TargetFrameworkVersion>
<%else%>
<Keyword><%if(UseOfMFC)%>MFCProj<%else%><%platform("Win32")%>Proj<%endif%></Keyword>
<%endif%>