summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMats Wichmann <mats@linux.com>2019-02-06 16:35:38 (GMT)
committerMats Wichmann <mats@linux.com>2019-02-06 16:35:38 (GMT)
commit7813d8b9e219c6020ce9e462f3b1c6be741ed29c (patch)
tree9141a1af5f1d1578bef5fea8bb05022526786901
parent6666adc9457f109ec25c9cd687f9eb0384392c73 (diff)
downloadSCons-7813d8b9e219c6020ce9e462f3b1c6be741ed29c.zip
SCons-7813d8b9e219c6020ce9e462f3b1c6be741ed29c.tar.gz
SCons-7813d8b9e219c6020ce9e462f3b1c6be741ed29c.tar.bz2
Add arm targets to doc for MSVS_ARCH
Signed-off-by: Mats Wichmann <mats@linux.com>
-rw-r--r--doc/generated/variables.gen9
-rw-r--r--src/engine/SCons/Tool/msvs.xml9
2 files changed, 12 insertions, 6 deletions
diff --git a/doc/generated/variables.gen b/doc/generated/variables.gen
index 194fb72..a6012b6 100644
--- 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
index 2292522..6467a2b 100644
--- 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>