Skip to content

Commit 518fd13

Browse files
committed
Second update for SCons/Tool/msvc.xml. [ci skip]
1 parent 0d37f06 commit 518fd13

File tree

1 file changed

+29
-22
lines changed

1 file changed

+29
-22
lines changed

SCons/Tool/msvc.xml

Lines changed: 29 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -370,28 +370,10 @@ loaded into the environment.
370370
</para>
371371

372372
<para>
373-
The valid values for &cv-MSVC_VERSION; represent major versions
374-
of the compiler. Versions ending in <literal>Exp</literal>
375-
refer to "Express" or "Express for Desktop" Visual Studio editions.
376-
An express version may have some feature limitations as compared to
377-
the full version. It is necessary to specify the <literal>Exp</literal>
378-
suffix when both express and non-express editions are installed
379-
simulaneously and the express version is desired. An express edition
380-
is used for the msvc version without the 'Exp' suffix when there is one
381-
edition installed and it is the express edition.
382-
</para>
383-
384-
<para>
385-
The following table shows correspondence
386-
of the selector string to various version indicators
387-
('x' is used as a placeholder for
388-
a single digit that can vary).
389-
Note that it is not necessary to install Visual Studio
390-
to build with &SCons; (for example, you can install only
391-
Build Tools), but if Visual Studio is installed,
392-
additional builders such as &b-link-MSVSSolution; and
393-
&b-link-MSVSProject; become avaialable and will
394-
correspond to the indicated versions.
373+
The valid values for &cv-MSVC_VERSION; represent major versions of the
374+
compiler suite. The following table shows the correspondence of
375+
&cv-MSVC_VERSION; version specifications to various Visual Studio version
376+
numbers. 'x' is used as a placeholder for a single digit that may vary.
395377
</para>
396378

397379
<informaltable>
@@ -548,6 +530,31 @@ correspond to the indicated versions.
548530
</tgroup>
549531
</informaltable>
550532

533+
<note>
534+
<itemizedlist>
535+
536+
<listitem><para>
537+
It is not necessary to install a Visual Studio IDE
538+
to build with &SCons; (for example, you can install only
539+
Build Tools), but when a Visual Studio IDE is installed,
540+
additional builders such as &b-link-MSVSSolution; and
541+
&b-link-MSVSProject; become available and correspond to
542+
the specified versions.
543+
</para></listitem>
544+
545+
<listitem><para>
546+
Versions ending in <literal>Exp</literal> refer to historical
547+
"Express" or "Express for Desktop" Visual Studio editions,
548+
which had feature limitations compared to the full editions.
549+
It is only necessary to specify the <literal>Exp</literal>
550+
suffix to select the express edition when both express and
551+
non-express editions of the same product are installed
552+
simulaneously. The <literal>Exp</literal> suffix is unnecessary,
553+
but accepted, when only the express edition is installed.
554+
</para></listitem>
555+
</itemizedlist>
556+
</note>
557+
551558
<para>
552559
The compilation environment can be further or more precisely specified through the
553560
use of several other &consvars;: see the descriptions of

0 commit comments

Comments
 (0)