summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-05-06 11:33:47 +0200
committerBram Moolenaar <Bram@vim.org>2015-05-06 11:33:47 +0200
commit4270496716fe851213e03bea7bd4368cc01ff807 (patch)
treef9580827d4adc7614fd3e0b96692d9e3a9337506
parent9c60161888277b84157441666cb59c813b1f85e3 (diff)
patch 7.4.728v7.4.728
Problem: Can't build with some version of Visual Studio 2015. Solution: Recognize another version 14 number. (Sinan)
-rw-r--r--src/Make_mvc.mak2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index 05574c62fa..063282dff4 100644
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@@ -446,7 +446,7 @@ MSVCVER = 11.0
!if "$(_NMAKE_VER)" == "12.00.21005.1"
MSVCVER = 12.0
!endif
-!if "$(_NMAKE_VER)" == "14.00.22609.0"
+!if ("$(_NMAKE_VER)" == "14.00.22609.0") || ("$(_NMAKE_VER)" == "14.00.22816.0")
MSVCVER = 14.0
!endif
!endif
diff --git a/src/version.c b/src/version.c
index 8e47112039..b469a6ddff 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 728,
+/**/
727,
/**/
726,