mirror of
https://github.com/vim/vim.git
synced 2025-10-02 05:04:20 -04:00
updated for version 7.2-204
This commit is contained in:
@@ -1,18 +1,18 @@
|
|||||||
# Makefile for Vim on Win32 (Windows NT/2000/XP/2003 and Windows 95/98/Me)
|
# 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
|
# and Win64, using the Microsoft Visual C++ compilers. Known to work with
|
||||||
# VC5, VC6 (VS98), VC7.0 (VS2002), VC7.1 (VS2003), VC8 (VS2005),
|
# VC5, VC6 (VS98), VC7.0 (VS2002), VC7.1 (VS2003), VC8 (VS2005),
|
||||||
# and VC9 (VS2008).
|
# VC9 (VS2008), and VC10 (VS2010).
|
||||||
#
|
#
|
||||||
# To build using other Windows compilers, see INSTALLpc.txt
|
# To build using other Windows compilers, see INSTALLpc.txt
|
||||||
#
|
#
|
||||||
# This makefile can build the console, GUI, OLE-enable, Perl-enabled and
|
# This makefile can build the console, GUI, OLE-enable, Perl-enabled and
|
||||||
# Python-enabled versions of vim for Win32 platforms.
|
# Python-enabled versions of Vim for Win32 platforms.
|
||||||
#
|
#
|
||||||
# The basic command line to build vim is:
|
# The basic command line to build Vim is:
|
||||||
#
|
#
|
||||||
# nmake -f Make_mvc.mak
|
# nmake -f Make_mvc.mak
|
||||||
#
|
#
|
||||||
# This will build the console version of vim with no additional interfaces.
|
# This will build the console version of Vim with no additional interfaces.
|
||||||
# To add features, define any of the following:
|
# To add features, define any of the following:
|
||||||
#
|
#
|
||||||
# !!!! After changing features do "nmake clean" first !!!!
|
# !!!! After changing features do "nmake clean" first !!!!
|
||||||
@@ -358,6 +358,9 @@ MSVCVER = 9.0
|
|||||||
!if "$(_NMAKE_VER)" == "9.00.30729.01"
|
!if "$(_NMAKE_VER)" == "9.00.30729.01"
|
||||||
MSVCVER = 9.0
|
MSVCVER = 9.0
|
||||||
!endif
|
!endif
|
||||||
|
!if "$(_NMAKE_VER)" == "10.00.20506.01"
|
||||||
|
MSVCVER = 10.0
|
||||||
|
!endif
|
||||||
!endif
|
!endif
|
||||||
|
|
||||||
# Abort bulding VIM if version of VC is unrecognised.
|
# Abort bulding VIM if version of VC is unrecognised.
|
||||||
@@ -372,7 +375,7 @@ MSVCVER = 9.0
|
|||||||
!endif
|
!endif
|
||||||
|
|
||||||
# Convert processor ID to MVC-compatible number
|
# Convert processor ID to MVC-compatible number
|
||||||
!if ("$(MSVCVER)" != "8.0") && ("$(MSVCVER)" != "9.0")
|
!if ("$(MSVCVER)" != "8.0") && ("$(MSVCVER)" != "9.0") && ("$(MSVCVER)" != "10.0")
|
||||||
!if "$(CPUNR)" == "i386"
|
!if "$(CPUNR)" == "i386"
|
||||||
CPUARG = /G3
|
CPUARG = /G3
|
||||||
!elseif "$(CPUNR)" == "i486"
|
!elseif "$(CPUNR)" == "i486"
|
||||||
@@ -405,7 +408,7 @@ OPTFLAG = /O2
|
|||||||
!else # MAXSPEED
|
!else # MAXSPEED
|
||||||
OPTFLAG = /Ox
|
OPTFLAG = /Ox
|
||||||
!endif
|
!endif
|
||||||
!if ("$(MSVCVER)" == "8.0") || ("$(MSVCVER)" == "9.0")
|
!if ("$(MSVCVER)" == "8.0") || ("$(MSVCVER)" == "9.0") || ("$(MSVCVER)" == "10.0")
|
||||||
# Use link time code generation if not worried about size
|
# Use link time code generation if not worried about size
|
||||||
!if "$(OPTIMIZE)" != "SPACE"
|
!if "$(OPTIMIZE)" != "SPACE"
|
||||||
OPTFLAG = $(OPTFLAG) /GL
|
OPTFLAG = $(OPTFLAG) /GL
|
||||||
@@ -793,7 +796,7 @@ LINKARGS2 = $(CON_LIB) $(GUI_LIB) $(LIBC) $(OLE_LIB) user32.lib $(SNIFF_LIB) \
|
|||||||
|
|
||||||
# Report link time code generation progress if used.
|
# Report link time code generation progress if used.
|
||||||
!ifdef NODEBUG
|
!ifdef NODEBUG
|
||||||
!if ("$(MSVCVER)" == "8.0") || ("$(MSVCVER)" == "9.0")
|
!if ("$(MSVCVER)" == "8.0") || ("$(MSVCVER)" == "9.0") || ("$(MSVCVER)" == "10.0")
|
||||||
!if "$(OPTIMIZE)" != "SPACE"
|
!if "$(OPTIMIZE)" != "SPACE"
|
||||||
LINKARGS1 = $(LINKARGS1) /LTCG:STATUS
|
LINKARGS1 = $(LINKARGS1) /LTCG:STATUS
|
||||||
!endif
|
!endif
|
||||||
|
@@ -676,6 +676,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
204,
|
||||||
/**/
|
/**/
|
||||||
203,
|
203,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user