ChangeLogTag: Tue May 6 12:32:53 UTC 2014 Chad Elliott <elliott_c@ociweb.com>

4 files changed, 17 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 1d496f1f..e101c283 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Tue May  6 12:32:53 UTC 2014  Chad Elliott  <elliott_c@ociweb.com>
+
+        * docs/templates/vc10.txt:
+        * templates/vc10.mpd:
+
+          Added a template variable to allow the user to override the
+          default intermediate directory.  Thanks to Craig Miller
+          <craigwmiller at yahoo dot com> for providing this patch.
+
+        * docs/templates/vc8csharp.txt:
+
+          Document a missing template variable.
+
 Thu Apr 10 08:26:17 UTC 2014  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * config/nddslib.mpb:
diff --git a/docs/templates/vc10.txt b/docs/templates/vc10.txt
index 2889a116..617149cb 100644
--- a/docs/templates/vc10.txt
+++ b/docs/templates/vc10.txt
@@ -77,6 +77,7 @@ ignorestandardincludepath = Prevents the compiler from searching for include fil
 imagehassafeexceptionhandlers = If specified, the linker will only produce an image if it can also produce a table of the image's safe exception handlers. This table specifies for the operating system which exception handlers are valid for the image.
 importlibrary = Overrides the default import library name.
 inlinefunctionexpansion = Select the level of inline function expansion (Disabled, OnlyExplicitInline, AnySuitable).
+intdir = Specify this to override the default intermediate directory.
 keycontainer = Specify a key container to sign an assembly.
 keyfile = Specify key or key pair to sign an assembly.  If set, embedmanifest defaults to false.
 largeaddressaware = Tells the linker that the application can handle addresses larger than 2 gigabytes.
@@ -151,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.
+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.
 treatlibwarningaserrors = Causes no output file to be generated if the librarian generates a warning.
diff --git a/docs/templates/vc8csharp.txt b/docs/templates/vc8csharp.txt
index 9eba6283..5a14df5e 100644
--- a/docs/templates/vc8csharp.txt
+++ b/docs/templates/vc8csharp.txt
@@ -22,6 +22,7 @@ targetframeworkprofile = Target a certain profile of the .NET framework, such as
 targetframeworkversion = The TargetFrameworkVersion attribute.  Setting this also enables a reference to the System.Core using the same version number as a requirement.
 toolsversion = The ToolsVersion attribute of the Project XML element.
 trace = This setting corresponds to the Build General property "Conditional Compilation Constants". If this boolean template variable is set, the TRACE constant will be defined.
+vcversion = Specifies the version of the generated .csproj file.  This value is determined by the VC8ProjectCreator.
 warning_level = This corresponds to the Build General property "Warning level". Valid values are 0 through 4.
 winapp = This boolean template variable indicates whether the application target is for the Console or Windows subsystem.
 xmlheader = Enable the <?xml ...?> header.
diff --git a/templates/vc10.mpd b/templates/vc10.mpd
index 7c50df8a..8b658d1a 100644
--- a/templates/vc10.mpd
+++ b/templates/vc10.mpd
@@ -89,7 +89,7 @@
     <NMakeOutput><%makeoutput%></NMakeOutput>
 <%else%>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='<%configuration%>|<%platform%>'"><%if(type_is_dynamic)%><%if(dllout)%><%dllout%>\<%else%><%libout%>\<%endif%><%else%><%if(type_is_static)%><%libout%>\<%else%><%if(exeout)%><%exeout%>\<%if(windows_style)%><%output_dir("Debug")%>\<%endif%><%else%><%if(windows_style)%><%output_dir("Debug")%>\<%else%><%output_dir(".")%>\<%endif%><%endif%><%endif%><%endif%></OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='<%configuration%>|<%platform%>'"><%intermediate_dir%>\<%noextension(project_file)%>\<%if(output_subdir)%><%output_subdir%>\<%endif%></IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='<%configuration%>|<%platform%>'"><%if(intdir)%><%intdir%>\<%else%><%intermediate_dir%>\<%noextension(project_file)%>\<%if(output_subdir)%><%output_subdir%>\<%endif%><%endif%></IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='<%configuration%>|<%platform%>'"><%if(debug_prj)%>true<%else%>false<%endif%></LinkIncremental>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='<%configuration%>|<%platform%>'"><%if(type_is_dynamic)%><%libname_prefix%><%sharedname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%else%><%if(type_is_static)%><%libname_prefix%><%staticname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%else%><%exename%><%if(use_exe_modifier)%><%lib_modifier%><%endif%><%endif%><%endif%></TargetName>
     <LocalDebuggerCommandArguments Condition="'$(Configuration)|$(Platform)'=='<%configuration%>|<%platform%>'"><%marker(debug_cmd_args)%></LocalDebuggerCommandArguments>