|
 |
81c2858 |
To: vim-dev@vim.org
|
|
|
81c2858 |
Subject: Patch 7.2.204 (extra)
|
|
|
81c2858 |
Fcc: outbox
|
|
|
81c2858 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
81c2858 |
Mime-Version: 1.0
|
|
|
81c2858 |
Content-Type: text/plain; charset=UTF-8
|
|
|
81c2858 |
Content-Transfer-Encoding: 8bit
|
|
|
81c2858 |
------------
|
|
|
81c2858 |
|
|
|
81c2858 |
Patch 7.2.204 (extra)
|
|
|
81c2858 |
Problem: Win32: Can't build with Visual Studio 2010 beta 1.
|
|
|
81c2858 |
Solution: Fix the makefile. (George Reilly)
|
|
|
81c2858 |
Files: src/Make_mvc.mak
|
|
|
81c2858 |
|
|
|
81c2858 |
|
|
|
81c2858 |
*** ../vim-7.2.203/src/Make_mvc.mak 2009-05-26 22:58:43.000000000 +0200
|
|
|
81c2858 |
--- src/Make_mvc.mak 2009-06-16 16:27:59.000000000 +0200
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 1,18 ****
|
|
|
81c2858 |
# Makefile for Vim on Win32 (Windows NT/2000/XP/2003 and Windows 95/98/Me)
|
|
|
81c2858 |
# and Win64, using the Microsoft Visual C++ compilers. Known to work with
|
|
|
81c2858 |
# VC5, VC6 (VS98), VC7.0 (VS2002), VC7.1 (VS2003), VC8 (VS2005),
|
|
|
81c2858 |
! # and VC9 (VS2008).
|
|
|
81c2858 |
#
|
|
|
81c2858 |
# To build using other Windows compilers, see INSTALLpc.txt
|
|
|
81c2858 |
#
|
|
|
81c2858 |
# This makefile can build the console, GUI, OLE-enable, Perl-enabled and
|
|
|
81c2858 |
! # Python-enabled versions of vim for Win32 platforms.
|
|
|
81c2858 |
#
|
|
|
81c2858 |
! # The basic command line to build vim is:
|
|
|
81c2858 |
#
|
|
|
81c2858 |
# nmake -f Make_mvc.mak
|
|
|
81c2858 |
#
|
|
|
81c2858 |
! # This will build the console version of vim with no additional interfaces.
|
|
|
81c2858 |
# To add features, define any of the following:
|
|
|
81c2858 |
#
|
|
|
81c2858 |
# !!!! After changing features do "nmake clean" first !!!!
|
|
|
81c2858 |
--- 1,18 ----
|
|
|
81c2858 |
# Makefile for Vim on Win32 (Windows NT/2000/XP/2003 and Windows 95/98/Me)
|
|
|
81c2858 |
# and Win64, using the Microsoft Visual C++ compilers. Known to work with
|
|
|
81c2858 |
# VC5, VC6 (VS98), VC7.0 (VS2002), VC7.1 (VS2003), VC8 (VS2005),
|
|
|
81c2858 |
! # VC9 (VS2008), and VC10 (VS2010).
|
|
|
81c2858 |
#
|
|
|
81c2858 |
# To build using other Windows compilers, see INSTALLpc.txt
|
|
|
81c2858 |
#
|
|
|
81c2858 |
# This makefile can build the console, GUI, OLE-enable, Perl-enabled and
|
|
|
81c2858 |
! # Python-enabled versions of Vim for Win32 platforms.
|
|
|
81c2858 |
#
|
|
|
81c2858 |
! # The basic command line to build Vim is:
|
|
|
81c2858 |
#
|
|
|
81c2858 |
# nmake -f Make_mvc.mak
|
|
|
81c2858 |
#
|
|
|
81c2858 |
! # This will build the console version of Vim with no additional interfaces.
|
|
|
81c2858 |
# To add features, define any of the following:
|
|
|
81c2858 |
#
|
|
|
81c2858 |
# !!!! After changing features do "nmake clean" first !!!!
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 358,363 ****
|
|
|
81c2858 |
--- 358,366 ----
|
|
|
81c2858 |
!if "$(_NMAKE_VER)" == "9.00.30729.01"
|
|
|
81c2858 |
MSVCVER = 9.0
|
|
|
81c2858 |
!endif
|
|
|
81c2858 |
+ !if "$(_NMAKE_VER)" == "10.00.20506.01"
|
|
|
81c2858 |
+ MSVCVER = 10.0
|
|
|
81c2858 |
+ !endif
|
|
|
81c2858 |
!endif
|
|
|
81c2858 |
|
|
|
81c2858 |
# Abort bulding VIM if version of VC is unrecognised.
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 372,378 ****
|
|
|
81c2858 |
!endif
|
|
|
81c2858 |
|
|
|
81c2858 |
# Convert processor ID to MVC-compatible number
|
|
|
81c2858 |
! !if ("$(MSVCVER)" != "8.0") && ("$(MSVCVER)" != "9.0")
|
|
|
81c2858 |
!if "$(CPUNR)" == "i386"
|
|
|
81c2858 |
CPUARG = /G3
|
|
|
81c2858 |
!elseif "$(CPUNR)" == "i486"
|
|
|
81c2858 |
--- 375,381 ----
|
|
|
81c2858 |
!endif
|
|
|
81c2858 |
|
|
|
81c2858 |
# Convert processor ID to MVC-compatible number
|
|
|
81c2858 |
! !if ("$(MSVCVER)" != "8.0") && ("$(MSVCVER)" != "9.0") && ("$(MSVCVER)" != "10.0")
|
|
|
81c2858 |
!if "$(CPUNR)" == "i386"
|
|
|
81c2858 |
CPUARG = /G3
|
|
|
81c2858 |
!elseif "$(CPUNR)" == "i486"
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 405,411 ****
|
|
|
81c2858 |
!else # MAXSPEED
|
|
|
81c2858 |
OPTFLAG = /Ox
|
|
|
81c2858 |
!endif
|
|
|
81c2858 |
! !if ("$(MSVCVER)" == "8.0") || ("$(MSVCVER)" == "9.0")
|
|
|
81c2858 |
# Use link time code generation if not worried about size
|
|
|
81c2858 |
!if "$(OPTIMIZE)" != "SPACE"
|
|
|
81c2858 |
OPTFLAG = $(OPTFLAG) /GL
|
|
|
81c2858 |
--- 408,414 ----
|
|
|
81c2858 |
!else # MAXSPEED
|
|
|
81c2858 |
OPTFLAG = /Ox
|
|
|
81c2858 |
!endif
|
|
|
81c2858 |
! !if ("$(MSVCVER)" == "8.0") || ("$(MSVCVER)" == "9.0") || ("$(MSVCVER)" == "10.0")
|
|
|
81c2858 |
# Use link time code generation if not worried about size
|
|
|
81c2858 |
!if "$(OPTIMIZE)" != "SPACE"
|
|
|
81c2858 |
OPTFLAG = $(OPTFLAG) /GL
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 793,799 ****
|
|
|
81c2858 |
|
|
|
81c2858 |
# Report link time code generation progress if used.
|
|
|
81c2858 |
!ifdef NODEBUG
|
|
|
81c2858 |
! !if ("$(MSVCVER)" == "8.0") || ("$(MSVCVER)" == "9.0")
|
|
|
81c2858 |
!if "$(OPTIMIZE)" != "SPACE"
|
|
|
81c2858 |
LINKARGS1 = $(LINKARGS1) /LTCG:STATUS
|
|
|
81c2858 |
!endif
|
|
|
81c2858 |
--- 796,802 ----
|
|
|
81c2858 |
|
|
|
81c2858 |
# Report link time code generation progress if used.
|
|
|
81c2858 |
!ifdef NODEBUG
|
|
|
81c2858 |
! !if ("$(MSVCVER)" == "8.0") || ("$(MSVCVER)" == "9.0") || ("$(MSVCVER)" == "10.0")
|
|
|
81c2858 |
!if "$(OPTIMIZE)" != "SPACE"
|
|
|
81c2858 |
LINKARGS1 = $(LINKARGS1) /LTCG:STATUS
|
|
|
81c2858 |
!endif
|
|
|
81c2858 |
*** ../vim-7.2.203/src/version.c 2009-06-16 16:01:34.000000000 +0200
|
|
|
81c2858 |
--- src/version.c 2009-06-16 16:32:41.000000000 +0200
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 678,679 ****
|
|
|
81c2858 |
--- 678,681 ----
|
|
|
81c2858 |
{ /* Add new patch number below this line */
|
|
|
81c2858 |
+ /**/
|
|
|
81c2858 |
+ 204,
|
|
|
81c2858 |
/**/
|
|
|
81c2858 |
|
|
|
81c2858 |
--
|
|
|
81c2858 |
How To Keep A Healthy Level Of Insanity:
|
|
|
81c2858 |
16. Have your coworkers address you by your wrestling name, Rock Hard Kim.
|
|
|
81c2858 |
|
|
|
81c2858 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
81c2858 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
81c2858 |
\\\ download, build and distribute -- http://www.A-A-P.org ///
|
|
|
81c2858 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|