Merge pull request #3293 from mwichmann/msvs-targets-doc

Add arm targets to doc for MSVS_ARCH
SCons · Feb 6, 2019 · 9f09013 · 9f09013
2 parents 0ac39b1 + 7813d8b
commit 9f09013
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/doc/generated/variables.gen b/doc/generated/variables.gen
@@ -4582,11 +4582,14 @@ Versions ending in <literal>Exp</literal> refer to "Express" or
   <varlistentry id="cv-MSVS_ARCH">
     <term>MSVS_ARCH</term>
     <listitem>
-      <para xmlns="http://www.scons.org/dbxsd/v1.0">Sets the architecture for which the generated project(s)
-      should build.</para> <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">Sets the architecture for which the generated project(s) should build.</para>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">
         The default value is <literal>x86</literal>.
         <literal>amd64</literal> is also supported by <application xmlns="http://www.scons.org/dbxsd/v1.0">SCons</application> for
-        some Visual Studio versions. Trying to set <envar xmlns="http://www.scons.org/dbxsd/v1.0">$MSVS_ARCH</envar>
+        most Visual Studio versions. Since Visual Studio 2015
+        <literal>arm</literal> is supported, and since Visual Studio
+        2017 <literal>arm64</literal> is supported.
+        Trying to set <envar xmlns="http://www.scons.org/dbxsd/v1.0">$MSVS_ARCH</envar>
         to an architecture that's not supported for a given Visual
         Studio version will generate an error.
       </para>

diff --git a/src/engine/SCons/Tool/msvs.xml b/src/engine/SCons/Tool/msvs.xml
@@ -463,11 +463,14 @@ env.MSVSSolution(target='Bar' + env['MSVSSOLUTIONSUFFIX'], projects=['bar' + env
     </summary>
   </cvar> <cvar name="MSVS_ARCH">
     <summary>
-      <para>Sets the architecture for which the generated project(s)
-      should build.</para> <para>
+      <para>Sets the architecture for which the generated project(s) should build.</para>
+      <para>
         The default value is <literal>x86</literal>.
         <literal>amd64</literal> is also supported by &SCons; for
-        some Visual Studio versions. Trying to set &cv-MSVS_ARCH;
+        most Visual Studio versions. Since Visual Studio 2015
+        <literal>arm</literal> is supported, and since Visual Studio
+        2017 <literal>arm64</literal> is supported.
+        Trying to set &cv-MSVS_ARCH;
         to an architecture that's not supported for a given Visual
         Studio version will generate an error.
       </para>