patch 7.4.728

Problem:    Can't build with some version of Visual Studio 2015.
Solution:   Recognize another version 14 number. (Sinan)

diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index 05574c62fa5e2cb3b634cd60eae2c0c0f6c0595c..063282dff40e956e40451317247179d159934fa1 100644 (file)
--- 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 8e4711203999c1ae65f6436f12993218cb7f4bde..b469a6ddff1aa57020e22cc4ade435f5e75889a0 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    728,
 /**/
     727,
 /**/