diff options
| author | Bram Moolenaar <Bram@vim.org> | 2012-09-18 18:27:12 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2012-09-18 18:27:12 +0200 |
| commit | 2b017fae8ffbf77fa59a8e9d49d9479ac5009a25 (patch) | |
| tree | 701f621c01554421018a2891cf1a21cbe547e655 | |
| parent | 4fabd7dd4a2f77bc741eda58126d529f26f16a8d (diff) | |
updated for version 7.3.665v7.3.665
Problem: MSVC 11 is not supported.
Solution: Recognize MSVC 11. (Raymond Ko)
| -rw-r--r-- | src/Make_mvc.mak | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 2 deletions
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 @@ -720,6 +720,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 665, +/**/ 664, /**/ 663, |