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