diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-08-02 11:43:59 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-08-02 11:43:59 +0200 |
commit | ce4614c8b5d138be5ec0b9f24dc8dd3296dd2af4 (patch) | |
tree | 5473294fb67614b735911f0a6ba90346c7beb923 /engine/SCons/Tool/msvs.py | |
parent | f46f0f9e847e1f1002ea96aa2467de11e9754fa2 (diff) | |
parent | daa63b77a7e2963e59a238e0dca7ceffce91ee99 (diff) |
Merge tag 'upstream/2.3.6'
Upstream version 2.3.6
Diffstat (limited to 'engine/SCons/Tool/msvs.py')
-rw-r--r-- | engine/SCons/Tool/msvs.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/engine/SCons/Tool/msvs.py b/engine/SCons/Tool/msvs.py index c32254a..d7c0955 100644 --- a/engine/SCons/Tool/msvs.py +++ b/engine/SCons/Tool/msvs.py @@ -30,7 +30,7 @@ selection method. # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -__revision__ = "src/engine/SCons/Tool/msvs.py pchdll:3325:cd517fae59a4 2015/06/18 06:53:27 bdbaddog" +__revision__ = "src/engine/SCons/Tool/msvs.py rel_2.3.5:3347:d31d5a4e74b6 2015/07/31 14:36:10 bdbaddog" import SCons.compat @@ -1535,7 +1535,9 @@ 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.version_num >= 11.0: + if self.version_num >= 12.0: + self.file.write('# Visual Studio 14\n') + elif 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') |