summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/CHANGES.txt1
-rw-r--r--src/engine/SCons/Tool/MSCommon/common.py2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 72cbcce..c903ece 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -31,6 +31,7 @@ RELEASE 2.X.X -
* removed Aegis support from runtest.py. (#2872)
From Gary Oberbrunner:
+ - Add MSVC10 and MSVC11 support to get_output low-level bat script runner.
- Fix MSVS solution generation for VS11, and fixed tests.
From Rob Managan:
diff --git a/src/engine/SCons/Tool/MSCommon/common.py b/src/engine/SCons/Tool/MSCommon/common.py
index 3ba1c1d..4f8ee8c 100644
--- a/src/engine/SCons/Tool/MSCommon/common.py
+++ b/src/engine/SCons/Tool/MSCommon/common.py
@@ -136,6 +136,8 @@ def get_output(vcbat, args = None, env = None):
# settings in vs.py.
vars = [
'COMSPEC',
+ 'VS110COMNTOOLS',
+ 'VS100COMNTOOLS',
'VS90COMNTOOLS',
'VS80COMNTOOLS',
'VS71COMNTOOLS',