summaryrefslogtreecommitdiff
path: root/src/engine/SCons/Tool/msvc.xml
diff options
context:
space:
mode:
authorLuca Falavigna <dktrkranz@debian.org>2010-01-23 15:22:14 +0100
committerLuca Falavigna <dktrkranz@debian.org>2010-01-23 15:22:14 +0100
commitaa2da1d1213172ca46db9b6fc6effca70df85981 (patch)
tree27ac30cce760e7959c8face762d06e10bcf9cf8e /src/engine/SCons/Tool/msvc.xml
parent478c10eaf20dcb9c0b7eeb4693a5f3dea9964ec7 (diff)
parent48f19e9e5ecc069f379ad433fdaf280ac9b54e16 (diff)
Merge commit 'upstream/1.2.0.d20100117'
Diffstat (limited to 'src/engine/SCons/Tool/msvc.xml')
-rw-r--r--src/engine/SCons/Tool/msvc.xml25
1 files changed, 16 insertions, 9 deletions
diff --git a/src/engine/SCons/Tool/msvc.xml b/src/engine/SCons/Tool/msvc.xml
index c744903..556036d 100644
--- a/src/engine/SCons/Tool/msvc.xml
+++ b/src/engine/SCons/Tool/msvc.xml
@@ -1,5 +1,5 @@
<!--
-Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 The SCons Foundation
+Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 The SCons Foundation
This file is processed by the bin/SConsDoc.py module.
See its __doc__ string for a discussion of the format.
@@ -143,12 +143,12 @@ env['CCPDBFLAGS'] = '/Zi /Fd${TARGET}.pdb'
<cvar name="MSVC_BATCH">
<summary>
When set to any true value,
-specifies that &SCons; should batch
+specifies that SCons should batch
compilation of object files
when calling the Microsoft Visual C/C++ compiler.
All compilations of source files from the same source directory
that generate target files in a same output directory
-and were configured in &SCons; using the same construction environment
+and were configured in SCons using the same construction environment
will be built in a single call to the compiler.
Only source files that have changed since their
object files were built will be passed to each compiler invocation
@@ -279,11 +279,12 @@ when the &cv-RCINCFLAGS; variable is expanded.
<summary>
Sets the preferred version of Microsoft Visual C/C++ to use.
-If &cv-MSVC_VERSION; is not set,
-&SCons; will (by default) select the latest version
-of Visual C/C++ installed on your system.
-If the specified version isn't installed,
-tool initialization will fail.
+If &cv-MSVC_VERSION; is not set, SCons will (by default) select the
+latest version of Visual C/C++ installed on your system. If the
+specified version isn't installed, tool initialization will fail.
+This variable must be passed as an argument to the Environment()
+constructor; setting it later has no effect. Set it to an unexpected
+value (e.g. "XXX") to see the valid values on your system.
</summary>
</cvar>
@@ -292,6 +293,8 @@ tool initialization will fail.
Sets the host architecture for Visual Studio compiler. If not set,
default to the detected host architecture: note that this may depend
on the python you are using.
+This variable must be passed as an argument to the Environment()
+constructor; setting it later has no effect.
Valid values are the same as for &cv-TARGET_ARCH;.
@@ -303,7 +306,11 @@ used on other OSes as well.
<summary>
Sets the target architecture for Visual Studio compiler (i.e. the arch
of the binaries generated by the compiler). If not set, default to
-&cv-HOST_ARCH;.
+&cv-HOST_ARCH;, or, if that is unset, to the architecture of the
+running machine's OS (note that the python build or architecture has no
+effect).
+This variable must be passed as an argument to the Environment()
+constructor; setting it later has no effect.
This is currently only used on Windows, but in the future it will be
used on other OSes as well.