diff options
| author | Russel Winder <russel@winder.org.uk> | 2012-08-18 12:04:04 (GMT) |
|---|---|---|
| committer | Russel Winder <russel@winder.org.uk> | 2012-08-18 12:04:04 (GMT) |
| commit | 3fc1398a12bc0211fd56cdb4f43948b7883cf808 (patch) | |
| tree | 3ca97357c79de7ee5179d9a52e25a168cfa9e7f1 /src | |
| parent | dc6191b6556ab6188dc58ada2cc943c45e64f08b (diff) | |
| parent | d7683b28d39cdb741f999fa2fb9c1ea34719a542 (diff) | |
| download | SCons-3fc1398a12bc0211fd56cdb4f43948b7883cf808.zip SCons-3fc1398a12bc0211fd56cdb4f43948b7883cf808.tar.gz SCons-3fc1398a12bc0211fd56cdb4f43948b7883cf808.tar.bz2 | |
Get latest from the mainline.
Diffstat (limited to 'src')
| -rw-r--r-- | src/CHANGES.txt | 6 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/msvs.py | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 7b27507..685430c 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -11,6 +11,11 @@ RELEASE 2.X.X - + From Gary Oberbrunner: + - Fix MSVS solution generation for VS11, and fixed tests. + +RELEASE 2.2.0 - Mon, 05 Aug 2012 15:37:48 +0000 + From dubcanada on Bitbucket: - Fix 32-bit Visual Express C++ on 64-bit Windows (generate 32-bit code) @@ -33,7 +38,6 @@ RELEASE 2.X.X - - Fix cloning of builders when cloning environment (#2821). From Gary Oberbrunner: - - Support Intel C v12 compiler on Linux and Mac (not yet Windows) - Show valid Visual Studio architectures in error message when user passes invalid arch. diff --git a/src/engine/SCons/Tool/msvs.py b/src/engine/SCons/Tool/msvs.py index 2b5373d..b10868f 100644 --- a/src/engine/SCons/Tool/msvs.py +++ b/src/engine/SCons/Tool/msvs.py @@ -1206,7 +1206,7 @@ class _GenerateV7DSW(_DSWGenerator): self.version_num, self.suite = msvs_parse_version(self.version) self.versionstr = '7.00' if self.version_num >= 11.0: - self.versionstr = '12.0' + self.versionstr = '12.00' elif self.version_num >= 10.0: self.versionstr = '11.00' elif self.version_num >= 9.0: @@ -1311,7 +1311,7 @@ class _GenerateV7DSW(_DSWGenerator): def PrintSolution(self): """Writes a solution file""" self.file.write('Microsoft Visual Studio Solution File, Format Version %s\n' % self.versionstr) - if self.versionstr >= 11.0: + if self.version_num >= 11.0: self.file.write('# Visual Studio 11\n') elif self.version_num >= 10.0: self.file.write('# Visual Studio 2010\n') |