diff options
| author | Bram Moolenaar <Bram@vim.org> | 2013-11-08 03:15:47 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2013-11-08 03:15:47 +0100 |
| commit | e5878f4be9f0cb6719220fa17f113fa24b1f3039 (patch) | |
| tree | ef752b3c70b5866b55960f2ad6aff0a2d1927a15 /src | |
| parent | 03e228a623304c0afed231ad1605153dd56335be (diff) | |
| download | vim-e5878f4be9f0cb6719220fa17f113fa24b1f3039.zip | |
updated for version 7.4.078
Problem: MSVC 2013 is not supported.
Solution: Recognize and support MSVC 2013. (Ed Brown)
Diffstat (limited to 'src')
| -rw-r--r-- | src/Make_mvc.mak | 11 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak index f23258b45..9ae64db79 100644 --- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -424,6 +424,9 @@ MSVCVER = 11.0 !if "$(_NMAKE_VER)" == "11.00.60610.1" MSVCVER = 11.0 !endif +!if "$(_NMAKE_VER)" == "12.00.21005.1" +MSVCVER = 12.0 +!endif !endif # Abort building VIM if version of VC is unrecognised. @@ -438,7 +441,7 @@ MSVCVER = 11.0 !endif # Convert processor ID to MVC-compatible number -!if ("$(MSVCVER)" != "8.0") && ("$(MSVCVER)" != "9.0") && ("$(MSVCVER)" != "10.0") && ("$(MSVCVER)" != "11.0") +!if ("$(MSVCVER)" != "8.0") && ("$(MSVCVER)" != "9.0") && ("$(MSVCVER)" != "10.0") && ("$(MSVCVER)" != "11.0") && ("$(MSVCVER)" != "12.0") !if "$(CPUNR)" == "i386" CPUARG = /G3 !elseif "$(CPUNR)" == "i486" @@ -472,7 +475,7 @@ OPTFLAG = /O2 OPTFLAG = /Ox !endif -!if ("$(MSVCVER)" == "8.0") || ("$(MSVCVER)" == "9.0") || ("$(MSVCVER)" == "10.0") || ("$(MSVCVER)" == "11.0") +!if ("$(MSVCVER)" == "8.0") || ("$(MSVCVER)" == "9.0") || ("$(MSVCVER)" == "10.0") || ("$(MSVCVER)" == "11.0") || ("$(MSVCVER)" == "12.0") # Use link time code generation if not worried about size !if "$(OPTIMIZE)" != "SPACE" OPTFLAG = $(OPTFLAG) /GL @@ -485,7 +488,7 @@ CFLAGS=$(CFLAGS) $(WP64CHECK) !endif # Static code analysis generally available starting with VS2012 -!if ("$(ANALYZE)" == "yes") && ("$(MSVCVER)" == "11.0") +!if ("$(ANALYZE)" == "yes") && ("$(MSVCVER)" == "11.0") && ("$(MSVCVER)" == "12.0") CFLAGS=$(CFLAGS) /analyze !endif @@ -943,7 +946,7 @@ LINKARGS2 = $(CON_LIB) $(GUI_LIB) $(LIBC) $(OLE_LIB) user32.lib $(SNIFF_LIB) \ # Report link time code generation progress if used. !ifdef NODEBUG -!if ("$(MSVCVER)" == "8.0") || ("$(MSVCVER)" == "9.0") || ("$(MSVCVER)" == "10.0") || ("$(MSVCVER)" == "11.0") +!if ("$(MSVCVER)" == "8.0") || ("$(MSVCVER)" == "9.0") || ("$(MSVCVER)" == "10.0") || ("$(MSVCVER)" == "11.0") || ("$(MSVCVER)" == "12.0") !if "$(OPTIMIZE)" != "SPACE" LINKARGS1 = $(LINKARGS1) /LTCG:STATUS !endif diff --git a/src/version.c b/src/version.c index 6e11f7da1..aef087992 100644 --- a/src/version.c +++ b/src/version.c @@ -739,6 +739,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 78, +/**/ 77, /**/ 76, |