diff options
| author | Gary Oberbrunner <garyo@oberbrunner.com> | 2010-02-12 00:39:58 (GMT) |
|---|---|---|
| committer | Gary Oberbrunner <garyo@oberbrunner.com> | 2010-02-12 00:39:58 (GMT) |
| commit | 554a19d68c75acddb5928e3c696f1b87c2f0cec9 (patch) | |
| tree | b0664ec052538fa56ee4f37b58a15bb534fb8582 | |
| parent | 323fce91805194f59a1ed9dd783e71ebabbd4104 (diff) | |
| download | SCons-554a19d68c75acddb5928e3c696f1b87c2f0cec9.zip SCons-554a19d68c75acddb5928e3c696f1b87c2f0cec9.tar.gz SCons-554a19d68c75acddb5928e3c696f1b87c2f0cec9.tar.bz2 | |
Add documentation for MSVC_USE_SCRIPT.
| -rw-r--r-- | src/RELEASE.txt | 9 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/msvc.xml | 14 |
2 files changed, 23 insertions, 0 deletions
diff --git a/src/RELEASE.txt b/src/RELEASE.txt index 80129e8..8e462e6 100644 --- a/src/RELEASE.txt +++ b/src/RELEASE.txt @@ -76,6 +76,15 @@ RELEASE 1.2.0.d20100117 - Sun, 17 Jan 2010 14:26:59 -0800 set TARGET_ARCH to "x86" or "x86_64" (various synonyms are accepted). + In addition, MSVC_USE_SCRIPT can be used to bypass the + above autodetection; setting it to the path of a Visual + Studio .bat file (e.g. vcvars.bat) will cause SCons to + run that bat file and extract the relevant variables + from the result (typically %INCLUDE%, %LIB%, and %PATH%). + Setting MSVC_USE_SCRIPT to None bypasses the Visual Studio + autodetection entirely; use this if you are importing + the shell env and running SCons in a Visual Studio cmd window. + Note that if you use MSVS_VERSION to build Visual Studio projects from your SConstructs, MSVS_VERSION must be set to the same version as MSVC_VERSION. diff --git a/src/engine/SCons/Tool/msvc.xml b/src/engine/SCons/Tool/msvc.xml index f4be770..c2fed86 100644 --- a/src/engine/SCons/Tool/msvc.xml +++ b/src/engine/SCons/Tool/msvc.xml @@ -288,6 +288,20 @@ value (e.g. "XXX") to see the valid values on your system. </summary> </cvar> +<cvar name="MSVC_USE_SCRIPT"> +<summary> +Use a batch script to set up Microsoft Visual Studio compiler + +&cv-MSVC_USE_SCRIPT; overrides &cv-MSVC_VERSION; and &cv-TARGET_ARCH;. +If set to the name of a Visual Studio .bat file (e.g. vcvars.bat), +SCons will run that bat file and extract the relevant variables from +the result (typically %INCLUDE%, %LIB%, and %PATH%). Setting +MSVC_USE_SCRIPT to None bypasses the Visual Studio autodetection +entirely; use this if you are running SCons in a Visual Studio cmd +window and importing the shell's environment variables. +</summary> +</cvar> + <cvar name="HOST_ARCH"> <summary> Sets the host architecture for Visual Studio compiler. If not set, |