[Scummvm-git-logs] scummvm master -> 65ef0c8ff84588962a32ddc2df2e1de17325d0a5

[peterkohaut]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
65ef0c8ff8 CREATE_PROJECT: Fixed solution version for Visual Studio 2015


Commit: 65ef0c8ff84588962a32ddc2df2e1de17325d0a5
    https://github.com/scummvm/scummvm/commit/65ef0c8ff84588962a32ddc2df2e1de17325d0a5
Author: Peter Kohaut (peter.kohaut at gmail.com)
Date: 2017-03-08T22:43:47+01:00

Commit Message:
CREATE_PROJECT: Fixed solution version for Visual Studio 2015

Changed paths:
    devtools/create_project/msbuild.cpp
    dists/msvc15/readme.txt


diff --git a/devtools/create_project/msbuild.cpp b/devtools/create_project/msbuild.cpp
index 2389bb6..762b3e4 100644
--- a/devtools/create_project/msbuild.cpp
+++ b/devtools/create_project/msbuild.cpp
@@ -65,7 +65,10 @@ int MSBuildProvider::getVisualStudioVersion() {
 }
 
 int MSBuildProvider::getSolutionVersion() {
-	return (_version == 15) ? 14 : _version + 1;
+	if (_version == 14 || _version == 15)
+		return 14;
+
+	return _version + 1;
 }
 
 namespace {
diff --git a/dists/msvc15/readme.txt b/dists/msvc15/readme.txt
index 3d16c7b..bce3ffb 100644
--- a/dists/msvc15/readme.txt
+++ b/dists/msvc15/readme.txt
@@ -2,5 +2,5 @@ The Visual Studio project files can now be created automatically from the GCC
 files using the create_project tool inside the /devtools/create_project folder.
 
 To create the default project files, build create_project.exe, copy it inside
-this folder and run the create_msvc14.bat file for a default build. You can run
+this folder and run the create_msvc15.bat file for a default build. You can run
 create_project.exe with no parameters to check the possible command-line options.