|
 |
d6ba96 |
To: vim_dev@googlegroups.com
|
|
|
d6ba96 |
Subject: Patch 7.4.078
|
|
|
d6ba96 |
Fcc: outbox
|
|
|
d6ba96 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
d6ba96 |
Mime-Version: 1.0
|
|
|
d6ba96 |
Content-Type: text/plain; charset=UTF-8
|
|
|
d6ba96 |
Content-Transfer-Encoding: 8bit
|
|
|
d6ba96 |
------------
|
|
|
d6ba96 |
|
|
|
d6ba96 |
Patch 7.4.078
|
|
|
d6ba96 |
Problem: MSVC 2013 is not supported.
|
|
|
d6ba96 |
Solution: Recognize and support MSVC 2013. (Ed Brown)
|
|
|
d6ba96 |
Files: src/Make_mvc.mak
|
|
|
d6ba96 |
|
|
|
d6ba96 |
|
|
|
d6ba96 |
*** ../vim-7.4.077/src/Make_mvc.mak 2013-07-09 13:13:12.000000000 +0200
|
|
|
d6ba96 |
--- src/Make_mvc.mak 2013-11-08 03:12:48.000000000 +0100
|
|
|
d6ba96 |
***************
|
|
|
d6ba96 |
*** 424,429 ****
|
|
|
d6ba96 |
--- 424,432 ----
|
|
|
d6ba96 |
!if "$(_NMAKE_VER)" == "11.00.60610.1"
|
|
|
d6ba96 |
MSVCVER = 11.0
|
|
|
d6ba96 |
!endif
|
|
|
d6ba96 |
+ !if "$(_NMAKE_VER)" == "12.00.21005.1"
|
|
|
d6ba96 |
+ MSVCVER = 12.0
|
|
|
d6ba96 |
+ !endif
|
|
|
d6ba96 |
!endif
|
|
|
d6ba96 |
|
|
|
d6ba96 |
# Abort building VIM if version of VC is unrecognised.
|
|
|
d6ba96 |
***************
|
|
|
d6ba96 |
*** 438,444 ****
|
|
|
d6ba96 |
!endif
|
|
|
d6ba96 |
|
|
|
d6ba96 |
# Convert processor ID to MVC-compatible number
|
|
|
d6ba96 |
! !if ("$(MSVCVER)" != "8.0") && ("$(MSVCVER)" != "9.0") && ("$(MSVCVER)" != "10.0") && ("$(MSVCVER)" != "11.0")
|
|
|
d6ba96 |
!if "$(CPUNR)" == "i386"
|
|
|
d6ba96 |
CPUARG = /G3
|
|
|
d6ba96 |
!elseif "$(CPUNR)" == "i486"
|
|
|
d6ba96 |
--- 441,447 ----
|
|
|
d6ba96 |
!endif
|
|
|
d6ba96 |
|
|
|
d6ba96 |
# Convert processor ID to MVC-compatible number
|
|
|
d6ba96 |
! !if ("$(MSVCVER)" != "8.0") && ("$(MSVCVER)" != "9.0") && ("$(MSVCVER)" != "10.0") && ("$(MSVCVER)" != "11.0") && ("$(MSVCVER)" != "12.0")
|
|
|
d6ba96 |
!if "$(CPUNR)" == "i386"
|
|
|
d6ba96 |
CPUARG = /G3
|
|
|
d6ba96 |
!elseif "$(CPUNR)" == "i486"
|
|
|
d6ba96 |
***************
|
|
|
d6ba96 |
*** 472,478 ****
|
|
|
d6ba96 |
OPTFLAG = /Ox
|
|
|
d6ba96 |
!endif
|
|
|
d6ba96 |
|
|
|
d6ba96 |
! !if ("$(MSVCVER)" == "8.0") || ("$(MSVCVER)" == "9.0") || ("$(MSVCVER)" == "10.0") || ("$(MSVCVER)" == "11.0")
|
|
|
d6ba96 |
# Use link time code generation if not worried about size
|
|
|
d6ba96 |
!if "$(OPTIMIZE)" != "SPACE"
|
|
|
d6ba96 |
OPTFLAG = $(OPTFLAG) /GL
|
|
|
d6ba96 |
--- 475,481 ----
|
|
|
d6ba96 |
OPTFLAG = /Ox
|
|
|
d6ba96 |
!endif
|
|
|
d6ba96 |
|
|
|
d6ba96 |
! !if ("$(MSVCVER)" == "8.0") || ("$(MSVCVER)" == "9.0") || ("$(MSVCVER)" == "10.0") || ("$(MSVCVER)" == "11.0") || ("$(MSVCVER)" == "12.0")
|
|
|
d6ba96 |
# Use link time code generation if not worried about size
|
|
|
d6ba96 |
!if "$(OPTIMIZE)" != "SPACE"
|
|
|
d6ba96 |
OPTFLAG = $(OPTFLAG) /GL
|
|
|
d6ba96 |
***************
|
|
|
d6ba96 |
*** 485,491 ****
|
|
|
d6ba96 |
!endif
|
|
|
d6ba96 |
|
|
|
d6ba96 |
# Static code analysis generally available starting with VS2012
|
|
|
d6ba96 |
! !if ("$(ANALYZE)" == "yes") && ("$(MSVCVER)" == "11.0")
|
|
|
d6ba96 |
CFLAGS=$(CFLAGS) /analyze
|
|
|
d6ba96 |
!endif
|
|
|
d6ba96 |
|
|
|
d6ba96 |
--- 488,494 ----
|
|
|
d6ba96 |
!endif
|
|
|
d6ba96 |
|
|
|
d6ba96 |
# Static code analysis generally available starting with VS2012
|
|
|
d6ba96 |
! !if ("$(ANALYZE)" == "yes") && ("$(MSVCVER)" == "11.0") && ("$(MSVCVER)" == "12.0")
|
|
|
d6ba96 |
CFLAGS=$(CFLAGS) /analyze
|
|
|
d6ba96 |
!endif
|
|
|
d6ba96 |
|
|
|
d6ba96 |
***************
|
|
|
d6ba96 |
*** 943,949 ****
|
|
|
d6ba96 |
|
|
|
d6ba96 |
# Report link time code generation progress if used.
|
|
|
d6ba96 |
!ifdef NODEBUG
|
|
|
d6ba96 |
! !if ("$(MSVCVER)" == "8.0") || ("$(MSVCVER)" == "9.0") || ("$(MSVCVER)" == "10.0") || ("$(MSVCVER)" == "11.0")
|
|
|
d6ba96 |
!if "$(OPTIMIZE)" != "SPACE"
|
|
|
d6ba96 |
LINKARGS1 = $(LINKARGS1) /LTCG:STATUS
|
|
|
d6ba96 |
!endif
|
|
|
d6ba96 |
--- 946,952 ----
|
|
|
d6ba96 |
|
|
|
d6ba96 |
# Report link time code generation progress if used.
|
|
|
d6ba96 |
!ifdef NODEBUG
|
|
|
d6ba96 |
! !if ("$(MSVCVER)" == "8.0") || ("$(MSVCVER)" == "9.0") || ("$(MSVCVER)" == "10.0") || ("$(MSVCVER)" == "11.0") || ("$(MSVCVER)" == "12.0")
|
|
|
d6ba96 |
!if "$(OPTIMIZE)" != "SPACE"
|
|
|
d6ba96 |
LINKARGS1 = $(LINKARGS1) /LTCG:STATUS
|
|
|
d6ba96 |
!endif
|
|
|
d6ba96 |
*** ../vim-7.4.077/src/version.c 2013-11-07 04:49:23.000000000 +0100
|
|
|
d6ba96 |
--- src/version.c 2013-11-08 03:13:56.000000000 +0100
|
|
|
d6ba96 |
***************
|
|
|
d6ba96 |
*** 740,741 ****
|
|
|
d6ba96 |
--- 740,743 ----
|
|
|
d6ba96 |
{ /* Add new patch number below this line */
|
|
|
d6ba96 |
+ /**/
|
|
|
d6ba96 |
+ 78,
|
|
|
d6ba96 |
/**/
|
|
|
d6ba96 |
|
|
|
d6ba96 |
--
|
|
|
d6ba96 |
Every time I lose weight, it finds me again!
|
|
|
d6ba96 |
|
|
|
d6ba96 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
d6ba96 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
d6ba96 |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
d6ba96 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|