diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak index 20b306d19c..afc3994750 100644 --- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -395,6 +395,9 @@ MSVCVER = 10.0 !if "$(_NMAKE_VER)" == "10.00.30319.01" MSVCVER = 10.0 !endif +!if "$(_NMAKE_VER)" == "11.00.50727.1" +MSVCVER = 11.0 +!endif !endif # Abort bulding VIM if version of VC is unrecognised. @@ -409,7 +412,7 @@ MSVCVER = 10.0 !endif # Convert processor ID to MVC-compatible number -!if ("$(MSVCVER)" != "8.0") && ("$(MSVCVER)" != "9.0") && ("$(MSVCVER)" != "10.0") +!if ("$(MSVCVER)" != "8.0") && ("$(MSVCVER)" != "9.0") && ("$(MSVCVER)" != "10.0") && ("$(MSVCVER)" != "11.0") !if "$(CPUNR)" == "i386" CPUARG = /G3 !elseif "$(CPUNR)" == "i486" @@ -443,7 +446,7 @@ OPTFLAG = /O2 OPTFLAG = /Ox !endif -!if ("$(MSVCVER)" == "8.0") || ("$(MSVCVER)" == "9.0") || ("$(MSVCVER)" == "10.0") +!if ("$(MSVCVER)" == "8.0") || ("$(MSVCVER)" == "9.0") || ("$(MSVCVER)" == "10.0") || ("$(MSVCVER)" == "11.0") # Use link time code generation if not worried about size !if "$(OPTIMIZE)" != "SPACE" OPTFLAG = $(OPTFLAG) /GL diff --git a/src/version.c b/src/version.c index d8ada6990e..0452d92bbc 100644 --- a/src/version.c +++ b/src/version.c @@ -719,6 +719,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 665, /**/ 664, /**/