2 Subject: Patch 7.2.204 (extra)
4 From: Bram Moolenaar <Bram@moolenaar.net>
6 Content-Type: text/plain; charset=UTF-8
7 Content-Transfer-Encoding: 8bit
11 Problem: Win32: Can't build with Visual Studio 2010 beta 1.
12 Solution: Fix the makefile. (George Reilly)
13 Files: src/Make_mvc.mak
16 *** ../vim-7.2.203/src/Make_mvc.mak 2009-05-26 22:58:43.000000000 +0200
17 --- src/Make_mvc.mak 2009-06-16 16:27:59.000000000 +0200
20 # Makefile for Vim on Win32 (Windows NT/2000/XP/2003 and Windows 95/98/Me)
21 # and Win64, using the Microsoft Visual C++ compilers. Known to work with
22 # VC5, VC6 (VS98), VC7.0 (VS2002), VC7.1 (VS2003), VC8 (VS2005),
25 # To build using other Windows compilers, see INSTALLpc.txt
27 # This makefile can build the console, GUI, OLE-enable, Perl-enabled and
28 ! # Python-enabled versions of vim for Win32 platforms.
30 ! # The basic command line to build vim is:
32 # nmake -f Make_mvc.mak
34 ! # This will build the console version of vim with no additional interfaces.
35 # To add features, define any of the following:
37 # !!!! After changing features do "nmake clean" first !!!!
39 # Makefile for Vim on Win32 (Windows NT/2000/XP/2003 and Windows 95/98/Me)
40 # and Win64, using the Microsoft Visual C++ compilers. Known to work with
41 # VC5, VC6 (VS98), VC7.0 (VS2002), VC7.1 (VS2003), VC8 (VS2005),
42 ! # VC9 (VS2008), and VC10 (VS2010).
44 # To build using other Windows compilers, see INSTALLpc.txt
46 # This makefile can build the console, GUI, OLE-enable, Perl-enabled and
47 ! # Python-enabled versions of Vim for Win32 platforms.
49 ! # The basic command line to build Vim is:
51 # nmake -f Make_mvc.mak
53 ! # This will build the console version of Vim with no additional interfaces.
54 # To add features, define any of the following:
56 # !!!! After changing features do "nmake clean" first !!!!
60 !if "$(_NMAKE_VER)" == "9.00.30729.01"
63 + !if "$(_NMAKE_VER)" == "10.00.20506.01"
68 # Abort bulding VIM if version of VC is unrecognised.
73 # Convert processor ID to MVC-compatible number
74 ! !if ("$(MSVCVER)" != "8.0") && ("$(MSVCVER)" != "9.0")
75 !if "$(CPUNR)" == "i386"
77 !elseif "$(CPUNR)" == "i486"
81 # Convert processor ID to MVC-compatible number
82 ! !if ("$(MSVCVER)" != "8.0") && ("$(MSVCVER)" != "9.0") && ("$(MSVCVER)" != "10.0")
83 !if "$(CPUNR)" == "i386"
85 !elseif "$(CPUNR)" == "i486"
91 ! !if ("$(MSVCVER)" == "8.0") || ("$(MSVCVER)" == "9.0")
92 # Use link time code generation if not worried about size
93 !if "$(OPTIMIZE)" != "SPACE"
94 OPTFLAG = $(OPTFLAG) /GL
99 ! !if ("$(MSVCVER)" == "8.0") || ("$(MSVCVER)" == "9.0") || ("$(MSVCVER)" == "10.0")
100 # Use link time code generation if not worried about size
101 !if "$(OPTIMIZE)" != "SPACE"
102 OPTFLAG = $(OPTFLAG) /GL
106 # Report link time code generation progress if used.
108 ! !if ("$(MSVCVER)" == "8.0") || ("$(MSVCVER)" == "9.0")
109 !if "$(OPTIMIZE)" != "SPACE"
110 LINKARGS1 = $(LINKARGS1) /LTCG:STATUS
114 # Report link time code generation progress if used.
116 ! !if ("$(MSVCVER)" == "8.0") || ("$(MSVCVER)" == "9.0") || ("$(MSVCVER)" == "10.0")
117 !if "$(OPTIMIZE)" != "SPACE"
118 LINKARGS1 = $(LINKARGS1) /LTCG:STATUS
120 *** ../vim-7.2.203/src/version.c 2009-06-16 16:01:34.000000000 +0200
121 --- src/version.c 2009-06-16 16:32:41.000000000 +0200
125 { /* Add new patch number below this line */
131 How To Keep A Healthy Level Of Insanity:
132 16. Have your coworkers address you by your wrestling name, Rock Hard Kim.
134 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
135 /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
136 \\\ download, build and distribute -- http://www.A-A-P.org ///
137 \\\ help me help AIDS victims -- http://ICCF-Holland.org ///