mirror of
git://slackware.nl/current.git
synced 2025-01-14 08:01:11 +01:00
5a12e7c134
Wed Aug 26 10:00:38 CDT 2009 Slackware 13.0 x86_64 is released as stable! Thanks to everyone who helped make this release possible -- see the RELEASE_NOTES for the credits. The ISOs are off to the replicator. This time it will be a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD. We're taking pre-orders now at store.slackware.com. Please consider picking up a copy to help support the project. Once again, thanks to the entire Slackware community for all the help testing and fixing things and offering suggestions during this development cycle. As always, have fun and enjoy! -P.
137 lines
4.3 KiB
Text
137 lines
4.3 KiB
Text
To: vim-dev@vim.org
|
|
Subject: Patch 7.2.204 (extra)
|
|
Fcc: outbox
|
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
Mime-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
------------
|
|
|
|
Patch 7.2.204 (extra)
|
|
Problem: Win32: Can't build with Visual Studio 2010 beta 1.
|
|
Solution: Fix the makefile. (George Reilly)
|
|
Files: src/Make_mvc.mak
|
|
|
|
|
|
*** ../vim-7.2.203/src/Make_mvc.mak 2009-05-26 22:58:43.000000000 +0200
|
|
--- src/Make_mvc.mak 2009-06-16 16:27:59.000000000 +0200
|
|
***************
|
|
*** 1,18 ****
|
|
# Makefile for Vim on Win32 (Windows NT/2000/XP/2003 and Windows 95/98/Me)
|
|
# and Win64, using the Microsoft Visual C++ compilers. Known to work with
|
|
# VC5, VC6 (VS98), VC7.0 (VS2002), VC7.1 (VS2003), VC8 (VS2005),
|
|
! # and VC9 (VS2008).
|
|
#
|
|
# To build using other Windows compilers, see INSTALLpc.txt
|
|
#
|
|
# This makefile can build the console, GUI, OLE-enable, Perl-enabled and
|
|
! # Python-enabled versions of vim for Win32 platforms.
|
|
#
|
|
! # The basic command line to build vim is:
|
|
#
|
|
# nmake -f Make_mvc.mak
|
|
#
|
|
! # This will build the console version of vim with no additional interfaces.
|
|
# To add features, define any of the following:
|
|
#
|
|
# !!!! After changing features do "nmake clean" first !!!!
|
|
--- 1,18 ----
|
|
# Makefile for Vim on Win32 (Windows NT/2000/XP/2003 and Windows 95/98/Me)
|
|
# and Win64, using the Microsoft Visual C++ compilers. Known to work with
|
|
# VC5, VC6 (VS98), VC7.0 (VS2002), VC7.1 (VS2003), VC8 (VS2005),
|
|
! # VC9 (VS2008), and VC10 (VS2010).
|
|
#
|
|
# To build using other Windows compilers, see INSTALLpc.txt
|
|
#
|
|
# This makefile can build the console, GUI, OLE-enable, Perl-enabled and
|
|
! # Python-enabled versions of Vim for Win32 platforms.
|
|
#
|
|
! # The basic command line to build Vim is:
|
|
#
|
|
# nmake -f Make_mvc.mak
|
|
#
|
|
! # This will build the console version of Vim with no additional interfaces.
|
|
# To add features, define any of the following:
|
|
#
|
|
# !!!! After changing features do "nmake clean" first !!!!
|
|
***************
|
|
*** 358,363 ****
|
|
--- 358,366 ----
|
|
!if "$(_NMAKE_VER)" == "9.00.30729.01"
|
|
MSVCVER = 9.0
|
|
!endif
|
|
+ !if "$(_NMAKE_VER)" == "10.00.20506.01"
|
|
+ MSVCVER = 10.0
|
|
+ !endif
|
|
!endif
|
|
|
|
# Abort bulding VIM if version of VC is unrecognised.
|
|
***************
|
|
*** 372,378 ****
|
|
!endif
|
|
|
|
# Convert processor ID to MVC-compatible number
|
|
! !if ("$(MSVCVER)" != "8.0") && ("$(MSVCVER)" != "9.0")
|
|
!if "$(CPUNR)" == "i386"
|
|
CPUARG = /G3
|
|
!elseif "$(CPUNR)" == "i486"
|
|
--- 375,381 ----
|
|
!endif
|
|
|
|
# Convert processor ID to MVC-compatible number
|
|
! !if ("$(MSVCVER)" != "8.0") && ("$(MSVCVER)" != "9.0") && ("$(MSVCVER)" != "10.0")
|
|
!if "$(CPUNR)" == "i386"
|
|
CPUARG = /G3
|
|
!elseif "$(CPUNR)" == "i486"
|
|
***************
|
|
*** 405,411 ****
|
|
!else # MAXSPEED
|
|
OPTFLAG = /Ox
|
|
!endif
|
|
! !if ("$(MSVCVER)" == "8.0") || ("$(MSVCVER)" == "9.0")
|
|
# Use link time code generation if not worried about size
|
|
!if "$(OPTIMIZE)" != "SPACE"
|
|
OPTFLAG = $(OPTFLAG) /GL
|
|
--- 408,414 ----
|
|
!else # MAXSPEED
|
|
OPTFLAG = /Ox
|
|
!endif
|
|
! !if ("$(MSVCVER)" == "8.0") || ("$(MSVCVER)" == "9.0") || ("$(MSVCVER)" == "10.0")
|
|
# Use link time code generation if not worried about size
|
|
!if "$(OPTIMIZE)" != "SPACE"
|
|
OPTFLAG = $(OPTFLAG) /GL
|
|
***************
|
|
*** 793,799 ****
|
|
|
|
# Report link time code generation progress if used.
|
|
!ifdef NODEBUG
|
|
! !if ("$(MSVCVER)" == "8.0") || ("$(MSVCVER)" == "9.0")
|
|
!if "$(OPTIMIZE)" != "SPACE"
|
|
LINKARGS1 = $(LINKARGS1) /LTCG:STATUS
|
|
!endif
|
|
--- 796,802 ----
|
|
|
|
# Report link time code generation progress if used.
|
|
!ifdef NODEBUG
|
|
! !if ("$(MSVCVER)" == "8.0") || ("$(MSVCVER)" == "9.0") || ("$(MSVCVER)" == "10.0")
|
|
!if "$(OPTIMIZE)" != "SPACE"
|
|
LINKARGS1 = $(LINKARGS1) /LTCG:STATUS
|
|
!endif
|
|
*** ../vim-7.2.203/src/version.c 2009-06-16 16:01:34.000000000 +0200
|
|
--- src/version.c 2009-06-16 16:32:41.000000000 +0200
|
|
***************
|
|
*** 678,679 ****
|
|
--- 678,681 ----
|
|
{ /* Add new patch number below this line */
|
|
+ /**/
|
|
+ 204,
|
|
/**/
|
|
|
|
--
|
|
How To Keep A Healthy Level Of Insanity:
|
|
16. Have your coworkers address you by your wrestling name, Rock Hard Kim.
|
|
|
|
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
\\\ download, build and distribute -- http://www.A-A-P.org ///
|
|
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|