[ci skip] Updated CHANGES.txt and msvs.xml documentation

2 files changed, 38 insertions, 3 deletions

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index a491ba5..ad42104 100755
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -9,6 +9,9 @@
 
 RELEASE  VERSION/DATE TO BE FILLED IN LATER
 
+  From Adam Gross:
+    - Upgrade and improve Visual Studio solution/project generation code
+
   From Peter Diener:
     - Additional fix to issue #3135 - Also handle 'pure' and 'elemental' type bound procedures
     - Fix issue #3135 - Handle Fortran submodules and type bound procedures
diff --git a/src/engine/SCons/Tool/msvs.xml b/src/engine/SCons/Tool/msvs.xml
index 6467a2b..6e622a7 100644
--- a/src/engine/SCons/Tool/msvs.xml
+++ b/src/engine/SCons/Tool/msvs.xml
@@ -48,14 +48,16 @@ See its __doc__ string for a discussion of the format.
         latest installed version, or the version specified by
         &cv-link-MSVS_VERSION; in the Environment constructor). For
         Visual Studio 6, it will generate a <filename>.dsp</filename>
-        file. For Visual Studio 7 (.NET) and later versions, it will
-        generate a <filename>.vcproj</filename> file.
+        file. For Visual Studio 7, 8, and 9, it will
+        generate a <filename>.vcproj</filename> file.  For Visual
+        Studio 10 and later, it will generate a
+        <filename>.vcxproj</filename> file.
       </para>
       <para>
         By default, this also generates a solution file for the
         specified project, a <filename>.dsw</filename> file for
         Visual Studio 6 or a <filename>.sln</filename> file for
-        Visual Studio 7 (.NET). This behavior may be disabled by
+        Visual Studio 7 and later. This behavior may be disabled by
         specifying <literal>auto_build_solution=0</literal> when you
         call &b-MSVSProject;, in which case you presumably want to
         build the solution file(s) by calling the &b-MSVSSolution;
@@ -128,6 +130,36 @@ See its __doc__ string for a discussion of the format.
           </listitem>
         </varlistentry>
         <varlistentry>
+          <term>cppdefines</term>
+          <listitem>
+            <para>
+              Preprocessor definitions for the different variants.
+              The number of <literal>cppdefines</literal> entries
+              must match the number of <literal>variant</literal>
+              entries, or be empty (not specified). If you give
+              only one, it will automatically be propagated to all
+              variants. If you don't give this parameter, SCons
+              will use the invoking environment's
+              <literator>CPPDEFINES</literator> entry for all variants.
+            </para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>cpppaths</term>
+          <listitem>
+            <para>
+              Compiler include paths for the different variants.
+              The number of <literal>cpppaths</literal> entries
+              must match the number of <literal>variant</literal>
+              entries, or be empty (not specified). If you give
+              only one, it will automatically be propagated to all
+              variants. If you don't give this parameter, SCons
+              will use the invoking environment's
+              <literator>CPPPATH</literator> entry for all variants.
+            </para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
           <term>buildtarget</term>
           <listitem>
             <para>