|
Karsten Hopp |
00b5f7 |
To: vim_dev@googlegroups.com
|
|
Karsten Hopp |
00b5f7 |
Subject: Patch 7.3.665
|
|
Karsten Hopp |
00b5f7 |
Fcc: outbox
|
|
Karsten Hopp |
00b5f7 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
Karsten Hopp |
00b5f7 |
Mime-Version: 1.0
|
|
Karsten Hopp |
00b5f7 |
Content-Type: text/plain; charset=UTF-8
|
|
Karsten Hopp |
00b5f7 |
Content-Transfer-Encoding: 8bit
|
|
Karsten Hopp |
00b5f7 |
------------
|
|
Karsten Hopp |
00b5f7 |
|
|
Karsten Hopp |
00b5f7 |
Patch 7.3.665
|
|
Karsten Hopp |
00b5f7 |
Problem: MSVC 11 is not supported.
|
|
Karsten Hopp |
00b5f7 |
Solution: Recognize MSVC 11. (Raymond Ko)
|
|
Karsten Hopp |
00b5f7 |
Files: src/Make_mvc.mak
|
|
Karsten Hopp |
00b5f7 |
|
|
Karsten Hopp |
00b5f7 |
|
|
Karsten Hopp |
00b5f7 |
*** ../vim-7.3.664/src/Make_mvc.mak 2012-09-05 17:57:34.000000000 +0200
|
|
Karsten Hopp |
00b5f7 |
--- src/Make_mvc.mak 2012-09-18 18:24:48.000000000 +0200
|
|
Karsten Hopp |
00b5f7 |
***************
|
|
Karsten Hopp |
00b5f7 |
*** 395,400 ****
|
|
Karsten Hopp |
00b5f7 |
--- 395,403 ----
|
|
Karsten Hopp |
00b5f7 |
!if "$(_NMAKE_VER)" == "10.00.30319.01"
|
|
Karsten Hopp |
00b5f7 |
MSVCVER = 10.0
|
|
Karsten Hopp |
00b5f7 |
!endif
|
|
Karsten Hopp |
00b5f7 |
+ !if "$(_NMAKE_VER)" == "11.00.50727.1"
|
|
Karsten Hopp |
00b5f7 |
+ MSVCVER = 11.0
|
|
Karsten Hopp |
00b5f7 |
+ !endif
|
|
Karsten Hopp |
00b5f7 |
!endif
|
|
Karsten Hopp |
00b5f7 |
|
|
Karsten Hopp |
00b5f7 |
# Abort bulding VIM if version of VC is unrecognised.
|
|
Karsten Hopp |
00b5f7 |
***************
|
|
Karsten Hopp |
00b5f7 |
*** 409,415 ****
|
|
Karsten Hopp |
00b5f7 |
!endif
|
|
Karsten Hopp |
00b5f7 |
|
|
Karsten Hopp |
00b5f7 |
# Convert processor ID to MVC-compatible number
|
|
Karsten Hopp |
00b5f7 |
! !if ("$(MSVCVER)" != "8.0") && ("$(MSVCVER)" != "9.0") && ("$(MSVCVER)" != "10.0")
|
|
Karsten Hopp |
00b5f7 |
!if "$(CPUNR)" == "i386"
|
|
Karsten Hopp |
00b5f7 |
CPUARG = /G3
|
|
Karsten Hopp |
00b5f7 |
!elseif "$(CPUNR)" == "i486"
|
|
Karsten Hopp |
00b5f7 |
--- 412,418 ----
|
|
Karsten Hopp |
00b5f7 |
!endif
|
|
Karsten Hopp |
00b5f7 |
|
|
Karsten Hopp |
00b5f7 |
# Convert processor ID to MVC-compatible number
|
|
Karsten Hopp |
00b5f7 |
! !if ("$(MSVCVER)" != "8.0") && ("$(MSVCVER)" != "9.0") && ("$(MSVCVER)" != "10.0") && ("$(MSVCVER)" != "11.0")
|
|
Karsten Hopp |
00b5f7 |
!if "$(CPUNR)" == "i386"
|
|
Karsten Hopp |
00b5f7 |
CPUARG = /G3
|
|
Karsten Hopp |
00b5f7 |
!elseif "$(CPUNR)" == "i486"
|
|
Karsten Hopp |
00b5f7 |
***************
|
|
Karsten Hopp |
00b5f7 |
*** 443,449 ****
|
|
Karsten Hopp |
00b5f7 |
OPTFLAG = /Ox
|
|
Karsten Hopp |
00b5f7 |
!endif
|
|
Karsten Hopp |
00b5f7 |
|
|
Karsten Hopp |
00b5f7 |
! !if ("$(MSVCVER)" == "8.0") || ("$(MSVCVER)" == "9.0") || ("$(MSVCVER)" == "10.0")
|
|
Karsten Hopp |
00b5f7 |
# Use link time code generation if not worried about size
|
|
Karsten Hopp |
00b5f7 |
!if "$(OPTIMIZE)" != "SPACE"
|
|
Karsten Hopp |
00b5f7 |
OPTFLAG = $(OPTFLAG) /GL
|
|
Karsten Hopp |
00b5f7 |
--- 446,452 ----
|
|
Karsten Hopp |
00b5f7 |
OPTFLAG = /Ox
|
|
Karsten Hopp |
00b5f7 |
!endif
|
|
Karsten Hopp |
00b5f7 |
|
|
Karsten Hopp |
00b5f7 |
! !if ("$(MSVCVER)" == "8.0") || ("$(MSVCVER)" == "9.0") || ("$(MSVCVER)" == "10.0") || ("$(MSVCVER)" == "11.0")
|
|
Karsten Hopp |
00b5f7 |
# Use link time code generation if not worried about size
|
|
Karsten Hopp |
00b5f7 |
!if "$(OPTIMIZE)" != "SPACE"
|
|
Karsten Hopp |
00b5f7 |
OPTFLAG = $(OPTFLAG) /GL
|
|
Karsten Hopp |
00b5f7 |
*** ../vim-7.3.664/src/version.c 2012-09-18 18:03:33.000000000 +0200
|
|
Karsten Hopp |
00b5f7 |
--- src/version.c 2012-09-18 18:26:16.000000000 +0200
|
|
Karsten Hopp |
00b5f7 |
***************
|
|
Karsten Hopp |
00b5f7 |
*** 721,722 ****
|
|
Karsten Hopp |
00b5f7 |
--- 721,724 ----
|
|
Karsten Hopp |
00b5f7 |
{ /* Add new patch number below this line */
|
|
Karsten Hopp |
00b5f7 |
+ /**/
|
|
Karsten Hopp |
00b5f7 |
+ 665,
|
|
Karsten Hopp |
00b5f7 |
/**/
|
|
Karsten Hopp |
00b5f7 |
|
|
Karsten Hopp |
00b5f7 |
--
|
|
Karsten Hopp |
00b5f7 |
There are 10 kinds of people: Those who understand binary and those who don't.
|
|
Karsten Hopp |
00b5f7 |
|
|
Karsten Hopp |
00b5f7 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
Karsten Hopp |
00b5f7 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
Karsten Hopp |
00b5f7 |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
Karsten Hopp |
00b5f7 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|