[packages/vim.git] / 7.1.134

To: vim-dev@vim.org
Subject: patch 7.1.134 (extra)
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.134 (extra)
Problem:    Win32: Can't build with VC8
Solution:   Detect the MSVC version instead of using NMAKE_VER.
            (Mike Williams)
Files:      src/Make_mvc.mak


*** ../vim-7.1.133/src/Make_mvc.mak	Tue Feb 20 03:15:08 2007
--- src/Make_mvc.mak	Mon Oct  1 21:37:20 2007
***************
*** 92,97 ****
--- 92,99 ----
  #       Netbeans Debugging Support: NBDEBUG=[yes or no] (should be no, yes
  #       doesn't work)
  #
+ #       Visual C Version: MSVCVER=m.n (default derived from nmake if undefined)
+ #
  # You can combine any of these interfaces
  #
  # Example: To build the non-debug, GUI version with Perl interface:
***************
*** 101,107 ****
  #	This makefile gives a fineness of control which is not supported in
  #	Visual C++ configuration files.  Therefore, debugging requires a bit of
  #	extra work.
! #	Make_dvc.mak is a Visual C++ project to access that support.
  #	To use Make_dvc.mak:
  #	1) Build Vim with Make_mvc.mak.
  #	     Use a "DEBUG=yes" argument to build Vim with debug support.
--- 103,110 ----
  #	This makefile gives a fineness of control which is not supported in
  #	Visual C++ configuration files.  Therefore, debugging requires a bit of
  #	extra work.
! #	Make_dvc.mak is a Visual C++ project to access that support.  It may be
! #	badly out of date for the Visual C++ you are using...
  #	To use Make_dvc.mak:
  #	1) Build Vim with Make_mvc.mak.
  #	     Use a "DEBUG=yes" argument to build Vim with debug support.
***************
*** 198,211 ****
  !if "$(DEBUG)" != "yes"
  NODEBUG = 1
  !else
  MAKEFLAGS_GVIMEXT = DEBUG=yes
  !endif
  
  
! # Get all sorts of useful, standard macros from the SDK.  (Note that
! # MSVC 2.2 does not install <ntwin32.mak> in the \msvc20\include
! # directory, but you can find it in \msvc20\include on the CD-ROM.
! # You may also need <win32.mak> from the same place.)
  
  !include <Win32.mak>
  
--- 201,212 ----
  !if "$(DEBUG)" != "yes"
  NODEBUG = 1
  !else
+ !undef NODEBUG
  MAKEFLAGS_GVIMEXT = DEBUG=yes
  !endif
  
  
! # Get all sorts of useful, standard macros from the Platform SDK.
  
  !include <Win32.mak>
  
***************
*** 272,283 ****
  
  # Set which version of the CRT to use
  !if defined(USE_MSVCRT)
! CVARS = $(cvarsdll)
  # !elseif defined(MULTITHREADED)
  # CVARS = $(cvarsmt)
  !else
  # CVARS = $(cvars)
! CVARS = $(cvarsmt)
  !endif
  
  # need advapi32.lib for GetUserName()
--- 273,284 ----
  
  # Set which version of the CRT to use
  !if defined(USE_MSVCRT)
! # CVARS = $(cvarsdll)
  # !elseif defined(MULTITHREADED)
  # CVARS = $(cvarsmt)
  !else
  # CVARS = $(cvars)
! # CVARS = $(cvarsmt)
  !endif
  
  # need advapi32.lib for GetUserName()
***************
*** 320,326 ****
--- 321,364 ----
  INTDIR=$(OBJDIR)
  OUTDIR=$(OBJDIR)
  
+ # Derive version of VC being used from nmake if not specified
+ !if "$(MSVCVER)" == ""
+ !if "$(_NMAKE_VER)" == ""
+ MSVCVER = 4.0
+ !endif
+ !if "$(_NMAKE_VER)" == "162"
+ MSVCVER = 5.0
+ !endif
+ !if "$(_NMAKE_VER)" == "6.00.8168.0"
+ MSVCVER = 6.0
+ !endif
+ !if "$(_NMAKE_VER)" == "7.00.9466"
+ MSVCVER = 7.0
+ !endif
+ !if "$(_NMAKE_VER)" == "7.10.3077"
+ MSVCVER = 7.1
+ !endif
+ !if "$(_NMAKE_VER)" == "8.00.50727.42"
+ MSVCVER = 8.0
+ !endif
+ !if "$(_NMAKE_VER)" == "8.00.50727.762"
+ MSVCVER = 8.0
+ !endif
+ !endif
+ 
+ # Abort bulding VIM if version of VC is unrecognised.
+ !ifndef MSVCVER
+ !message *** ERROR
+ !message Cannot determine Visual C version being used.  If you are using the
+ !message Windows SDK then you must have the environment variable MSVCVER set to
+ !message your version of the VC compiler.  If you are not using the Express
+ !message version of Visual C you van either set MSVCVER or update this makefile
+ !message to handle the new value for _NMAKE_VER.
+ !error Make aborted.
+ !endif
+ 
  # Convert processor ID to MVC-compatible number
+ !if "$(MSVCVER)" != "8.0"
  !if "$(CPUNR)" == "i386"
  CPUARG = /G3
  !elseif "$(CPUNR)" == "i486"
***************
*** 334,339 ****
--- 372,386 ----
  !else
  CPUARG =
  !endif
+ !else
+ # VC8 only allows specifying SSE architecture
+ !if "$(CPUNR)" == "pentium4"
+ CPUARG = /arch:SSE2
+ !endif
+ !endif
+ 
+ LIBC =
+ DEBUGINFO = /Zi
  
  !ifdef NODEBUG
  VIM = vim
***************
*** 344,384 ****
  !else # MAXSPEED
  OPTFLAG = /Ox
  !endif
  CFLAGS = $(CFLAGS) $(OPTFLAG) -DNDEBUG $(CPUARG)
  RCFLAGS = $(rcflags) $(rcvars) -DNDEBUG
  ! ifdef USE_MSVCRT
! CFLAGS = $(CFLAGS) -MD
  LIBC = msvcrt.lib
- # CFLAGS = $(CFLAGS) $(cvarsdll)
- # ! elseif defined(MULTITHREADED)
- # LIBC = libcmt.lib
- # CFLAGS = $(CFLAGS) $(cvarsmt)
  ! else
- # LIBC = libc.lib
  LIBC = libcmt.lib
! # CFLAGS = $(CFLAGS) $(cvars)
  ! endif
  !else  # DEBUG
  VIM = vimd
  CFLAGS = $(CFLAGS) -D_DEBUG -DDEBUG /Od
  RCFLAGS = $(rcflags) $(rcvars) -D_DEBUG -DDEBUG
  # The /fixed:no is needed for Quantify. Assume not 4.? as unsupported in VC4.0.
! ! if "$(_NMAKE_VER)" == ""
  LIBC =
  ! else
  LIBC = /fixed:no
  ! endif
  ! ifdef USE_MSVCRT
! CFLAGS = $(CFLAGS) -MDd
  LIBC = $(LIBC) msvcrtd.lib
- # CFLAGS = $(CFLAGS) $(cvarsdll)
- # ! elseif defined(MULTITHREADED)
- # LIBC = $(LIBC) libcmtd.lib
- # CFLAGS = $(CFLAGS) $(cvarsmt)
  ! else
- # LIBC = $(LIBC) libcd.lib
  LIBC = $(LIBC) libcmtd.lib
! # CFLAGS = $(CFLAGS) $(cvars)
  ! endif
  !endif # DEBUG
  
--- 391,430 ----
  !else # MAXSPEED
  OPTFLAG = /Ox
  !endif
+ !if "$(MSVCVER)" == "8.0"
+ # Use link time code generation if not worried about size
+ !if "$(OPTIMIZE)" != "SPACE"
+ OPTFLAG = $(OPTFLAG) /GL
+ !endif
+ !endif
  CFLAGS = $(CFLAGS) $(OPTFLAG) -DNDEBUG $(CPUARG)
  RCFLAGS = $(rcflags) $(rcvars) -DNDEBUG
  ! ifdef USE_MSVCRT
! CFLAGS = $(CFLAGS) /MD
  LIBC = msvcrt.lib
  ! else
  LIBC = libcmt.lib
! CFLAGS = $(CFLAGS) /MT
  ! endif
  !else  # DEBUG
  VIM = vimd
+ ! if "$(CPU)" == "i386"
+ DEBUGINFO = /ZI
+ ! endif
  CFLAGS = $(CFLAGS) -D_DEBUG -DDEBUG /Od
  RCFLAGS = $(rcflags) $(rcvars) -D_DEBUG -DDEBUG
  # The /fixed:no is needed for Quantify. Assume not 4.? as unsupported in VC4.0.
! ! if "$(MSVCVER)" == "4.0"
  LIBC =
  ! else
  LIBC = /fixed:no
  ! endif
  ! ifdef USE_MSVCRT
! CFLAGS = $(CFLAGS) /MDd
  LIBC = $(LIBC) msvcrtd.lib
  ! else
  LIBC = $(LIBC) libcmtd.lib
! CFLAGS = $(CFLAGS) /MTd
  ! endif
  !endif # DEBUG
  
***************
*** 681,696 ****
  #
  # Always generate the .pdb file, so that we get debug symbols that can be used
  # on a crash (doesn't add overhead to the executable).
  #
! CFLAGS = $(CFLAGS) /Zi /Fd$(OUTDIR)/
! LINK_PDB = /PDB:$(VIM).pdb -debug # -debug:full -debugtype:cv,fixup
  
  #
  # End extra feature include
  #
  !message
  
! conflags = /nologo /subsystem:$(SUBSYSTEM) /incremental:no
  
  PATHDEF_SRC = $(OUTDIR)\pathdef.c
  
--- 727,744 ----
  #
  # Always generate the .pdb file, so that we get debug symbols that can be used
  # on a crash (doesn't add overhead to the executable).
+ # Generate edit-and-continue debug info when no optimization - allows to
+ # debug more conveniently (able to look at variables which are in registers)
  #
! CFLAGS = $(CFLAGS) /Fd$(OUTDIR)/ $(DEBUGINFO)
! LINK_PDB = /PDB:$(VIM).pdb -debug
  
  #
  # End extra feature include
  #
  !message
  
! conflags = /nologo /subsystem:$(SUBSYSTEM)
  
  PATHDEF_SRC = $(OUTDIR)\pathdef.c
  
***************
*** 702,712 ****
  conflags = $(conflags) /map /mapinfo:lines
  !ENDIF
  
! LINKARGS1 = $(linkdebug) $(conflags) /nodefaultlib:libc
  LINKARGS2 = $(CON_LIB) $(GUI_LIB) $(LIBC) $(OLE_LIB)  user32.lib $(SNIFF_LIB) \
  		$(MZSCHEME_LIB) $(PERL_LIB) $(PYTHON_LIB) $(RUBY_LIB) \
  		$(TCL_LIB) $(NETBEANS_LIB) $(XPM_LIB) $(LINK_PDB)
  
  all:	$(VIM).exe vimrun.exe install.exe uninstal.exe xxd/xxd.exe \
  		GvimExt/gvimext.dll
  
--- 750,769 ----
  conflags = $(conflags) /map /mapinfo:lines
  !ENDIF
  
! LINKARGS1 = $(linkdebug) $(conflags)
  LINKARGS2 = $(CON_LIB) $(GUI_LIB) $(LIBC) $(OLE_LIB)  user32.lib $(SNIFF_LIB) \
  		$(MZSCHEME_LIB) $(PERL_LIB) $(PYTHON_LIB) $(RUBY_LIB) \
  		$(TCL_LIB) $(NETBEANS_LIB) $(XPM_LIB) $(LINK_PDB)
  
+ # Report link time code generation progress if used. 
+ !ifdef NODEBUG
+ !if "$(MSVCVER)" == "8.0"
+ !if "$(OPTIMIZE)" != "SPACE"
+ LINKARGS1 = $(LINKARGS1) /LTCG:STATUS
+ !endif
+ !endif
+ !endif
+ 
  all:	$(VIM).exe vimrun.exe install.exe uninstal.exe xxd/xxd.exe \
  		GvimExt/gvimext.dll
  
***************
*** 794,800 ****
  
  # Create a default rule for transforming .c files to .obj files in $(OUTDIR)
  # Batch compilation is supported by nmake 1.62 (part of VS 5.0) and later)
! !IF "$(_NMAKE_VER)" == ""
  .c{$(OUTDIR)/}.obj:
  !ELSE
  .c{$(OUTDIR)/}.obj::
--- 851,857 ----
  
  # Create a default rule for transforming .c files to .obj files in $(OUTDIR)
  # Batch compilation is supported by nmake 1.62 (part of VS 5.0) and later)
! !IF "$(MSVCVER)" == "4.0"
  .c{$(OUTDIR)/}.obj:
  !ELSE
  .c{$(OUTDIR)/}.obj::
***************
*** 803,809 ****
  
  # Create a default rule for transforming .cpp files to .obj files in $(OUTDIR)
  # Batch compilation is supported by nmake 1.62 (part of VS 5.0) and later)
! !IF "$(_NMAKE_VER)" == ""
  .cpp{$(OUTDIR)/}.obj:
  !ELSE
  .cpp{$(OUTDIR)/}.obj::
--- 860,866 ----
  
  # Create a default rule for transforming .cpp files to .obj files in $(OUTDIR)
  # Batch compilation is supported by nmake 1.62 (part of VS 5.0) and later)
! !IF "$(MSVCVER)" == "4.0"
  .cpp{$(OUTDIR)/}.obj:
  !ELSE
  .cpp{$(OUTDIR)/}.obj::
*** ../vim-7.1.133/src/version.c	Wed Oct  3 12:49:24 2007
--- src/version.c	Wed Oct  3 13:23:51 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     134,
  /**/

-- 
BLACK KNIGHT: The Black Knight always triumphs. Have at you!
   ARTHUR takes his last leg off.  The BLACK KNIGHT's body lands upright.
BLACK KNIGHT: All right, we'll call it a draw.
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

 /// 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    ///
Commit	Line	Data
25f687b8 AM	1	To: vim-dev@vim.org
	2	Subject: patch 7.1.134 (extra)
	3	Fcc: outbox
	4	From: Bram Moolenaar <Bram@moolenaar.net>
	5	Mime-Version: 1.0
	6	Content-Type: text/plain; charset=ISO-8859-1
	7	Content-Transfer-Encoding: 8bit
	8	------------
	9
	10	Patch 7.1.134 (extra)
	11	Problem: Win32: Can't build with VC8
	12	Solution: Detect the MSVC version instead of using NMAKE_VER.
	13	(Mike Williams)
	14	Files: src/Make_mvc.mak
	15
	16
	17	*** ../vim-7.1.133/src/Make_mvc.mak Tue Feb 20 03:15:08 2007
	18	--- src/Make_mvc.mak Mon Oct 1 21:37:20 2007
	19	***************
	20	* 92,97 **
	21	--- 92,99 ----
	22	# Netbeans Debugging Support: NBDEBUG=[yes or no] (should be no, yes
	23	# doesn't work)
	24	#
	25	+ # Visual C Version: MSVCVER=m.n (default derived from nmake if undefined)
	26	+ #
	27	# You can combine any of these interfaces
	28	#
	29	# Example: To build the non-debug, GUI version with Perl interface:
	30	***************
	31	* 101,107 **
	32	# This makefile gives a fineness of control which is not supported in
	33	# Visual C++ configuration files. Therefore, debugging requires a bit of
	34	# extra work.
	35	! # Make_dvc.mak is a Visual C++ project to access that support.
	36	# To use Make_dvc.mak:
	37	# 1) Build Vim with Make_mvc.mak.
	38	# Use a "DEBUG=yes" argument to build Vim with debug support.
	39	--- 103,110 ----
	40	# This makefile gives a fineness of control which is not supported in
	41	# Visual C++ configuration files. Therefore, debugging requires a bit of
	42	# extra work.
	43	! # Make_dvc.mak is a Visual C++ project to access that support. It may be
	44	! # badly out of date for the Visual C++ you are using...
	45	# To use Make_dvc.mak:
	46	# 1) Build Vim with Make_mvc.mak.
	47	# Use a "DEBUG=yes" argument to build Vim with debug support.
	48	***************
	49	* 198,211 **
	50	!if "$(DEBUG)" != "yes"
	51	NODEBUG = 1
	52	!else
	53	MAKEFLAGS_GVIMEXT = DEBUG=yes
	54	!endif
	55
	56
	57	! # Get all sorts of useful, standard macros from the SDK. (Note that
	58	! # MSVC 2.2 does not install <ntwin32.mak> in the \msvc20\include
	59	! # directory, but you can find it in \msvc20\include on the CD-ROM.
	60	! # You may also need <win32.mak> from the same place.)
	61
	62	!include <Win32.mak>
	63
	64	--- 201,212 ----
65	!if "$(DEBUG)" != "yes"
66	NODEBUG = 1
67	!else
68	+ !undef NODEBUG
69	MAKEFLAGS_GVIMEXT = DEBUG=yes
70	!endif
71
72
73	! # Get all sorts of useful, standard macros from the Platform SDK.
74
75	!include <Win32.mak>
76
77	***************
78	* 272,283 **
79
80	# Set which version of the CRT to use
81	!if defined(USE_MSVCRT)
82	! CVARS = $(cvarsdll)
83	# !elseif defined(MULTITHREADED)
84	# CVARS = $(cvarsmt)
85	!else
86	# CVARS = $(cvars)
87	! CVARS = $(cvarsmt)
88	!endif
89
90	# need advapi32.lib for GetUserName()
91	--- 273,284 ----
92
93	# Set which version of the CRT to use
94	!if defined(USE_MSVCRT)
95	! # CVARS = $(cvarsdll)
96	# !elseif defined(MULTITHREADED)
97	# CVARS = $(cvarsmt)
98	!else
99	# CVARS = $(cvars)
100	! # CVARS = $(cvarsmt)
101	!endif
102
103	# need advapi32.lib for GetUserName()
104	***************
105	* 320,326 **
106	--- 321,364 ----
107	INTDIR=$(OBJDIR)
108	OUTDIR=$(OBJDIR)
109
110	+ # Derive version of VC being used from nmake if not specified
111	+ !if "$(MSVCVER)" == ""
112	+ !if "$(_NMAKE_VER)" == ""
113	+ MSVCVER = 4.0
114	+ !endif
115	+ !if "$(_NMAKE_VER)" == "162"
116	+ MSVCVER = 5.0
117	+ !endif
118	+ !if "$(_NMAKE_VER)" == "6.00.8168.0"
119	+ MSVCVER = 6.0
120	+ !endif
121	+ !if "$(_NMAKE_VER)" == "7.00.9466"
122	+ MSVCVER = 7.0
123	+ !endif
124	+ !if "$(_NMAKE_VER)" == "7.10.3077"
125	+ MSVCVER = 7.1
126	+ !endif
127	+ !if "$(_NMAKE_VER)" == "8.00.50727.42"
128	+ MSVCVER = 8.0
129	+ !endif
130	+ !if "$(_NMAKE_VER)" == "8.00.50727.762"
131	+ MSVCVER = 8.0
132	+ !endif
133	+ !endif
134	+
135	+ # Abort bulding VIM if version of VC is unrecognised.
136	+ !ifndef MSVCVER
137	+ !message *** ERROR
138	+ !message Cannot determine Visual C version being used. If you are using the
139	+ !message Windows SDK then you must have the environment variable MSVCVER set to
140	+ !message your version of the VC compiler. If you are not using the Express
141	+ !message version of Visual C you van either set MSVCVER or update this makefile
142	+ !message to handle the new value for _NMAKE_VER.
143	+ !error Make aborted.
144	+ !endif
145	+
146	# Convert processor ID to MVC-compatible number
147	+ !if "$(MSVCVER)" != "8.0"
148	!if "$(CPUNR)" == "i386"
149	CPUARG = /G3
150	!elseif "$(CPUNR)" == "i486"
151	***************
152	* 334,339 **
153	--- 372,386 ----
154	!else
155	CPUARG =
156	!endif
157	+ !else
158	+ # VC8 only allows specifying SSE architecture
159	+ !if "$(CPUNR)" == "pentium4"
160	+ CPUARG = /arch:SSE2
161	+ !endif
162	+ !endif
163	+
164	+ LIBC =
165	+ DEBUGINFO = /Zi
166
167	!ifdef NODEBUG
168	VIM = vim
169	***************
170	* 344,384 **
171	!else # MAXSPEED
172	OPTFLAG = /Ox
173	!endif
174	CFLAGS = $(CFLAGS) $(OPTFLAG) -DNDEBUG $(CPUARG)
175	RCFLAGS = $(rcflags) $(rcvars) -DNDEBUG
176	! ifdef USE_MSVCRT
177	! CFLAGS = $(CFLAGS) -MD
178	LIBC = msvcrt.lib
179	- # CFLAGS = $(CFLAGS) $(cvarsdll)
180	- # ! elseif defined(MULTITHREADED)
181	- # LIBC = libcmt.lib
182	- # CFLAGS = $(CFLAGS) $(cvarsmt)
183	! else
184	- # LIBC = libc.lib
185	LIBC = libcmt.lib
186	! # CFLAGS = $(CFLAGS) $(cvars)
187	! endif
188	!else # DEBUG
189	VIM = vimd
190	CFLAGS = $(CFLAGS) -D_DEBUG -DDEBUG /Od
191	RCFLAGS = $(rcflags) $(rcvars) -D_DEBUG -DDEBUG
192	# The /fixed:no is needed for Quantify. Assume not 4.? as unsupported in VC4.0.
193	! ! if "$(_NMAKE_VER)" == ""
194	LIBC =
195	! else
196	LIBC = /fixed:no
197	! endif
198	! ifdef USE_MSVCRT
199	! CFLAGS = $(CFLAGS) -MDd
200	LIBC = $(LIBC) msvcrtd.lib
201	- # CFLAGS = $(CFLAGS) $(cvarsdll)
202	- # ! elseif defined(MULTITHREADED)
203	- # LIBC = $(LIBC) libcmtd.lib
204	- # CFLAGS = $(CFLAGS) $(cvarsmt)
205	! else
206	- # LIBC = $(LIBC) libcd.lib
207	LIBC = $(LIBC) libcmtd.lib
208	! # CFLAGS = $(CFLAGS) $(cvars)
209	! endif
210	!endif # DEBUG
211
212	--- 391,430 ----
213	!else # MAXSPEED
214	OPTFLAG = /Ox
215	!endif
216	+ !if "$(MSVCVER)" == "8.0"
217	+ # Use link time code generation if not worried about size
218	+ !if "$(OPTIMIZE)" != "SPACE"
219	+ OPTFLAG = $(OPTFLAG) /GL
220	+ !endif
221	+ !endif
222	CFLAGS = $(CFLAGS) $(OPTFLAG) -DNDEBUG $(CPUARG)
223	RCFLAGS = $(rcflags) $(rcvars) -DNDEBUG
224	! ifdef USE_MSVCRT
225	! CFLAGS = $(CFLAGS) /MD
226	LIBC = msvcrt.lib
227	! else
228	LIBC = libcmt.lib
229	! CFLAGS = $(CFLAGS) /MT
230	! endif
231	!else # DEBUG
232	VIM = vimd
233	+ ! if "$(CPU)" == "i386"
234	+ DEBUGINFO = /ZI
235	+ ! endif
236	CFLAGS = $(CFLAGS) -D_DEBUG -DDEBUG /Od
237	RCFLAGS = $(rcflags) $(rcvars) -D_DEBUG -DDEBUG
238	# The /fixed:no is needed for Quantify. Assume not 4.? as unsupported in VC4.0.
239	! ! if "$(MSVCVER)" == "4.0"
240	LIBC =
241	! else
242	LIBC = /fixed:no
243	! endif
244	! ifdef USE_MSVCRT
245	! CFLAGS = $(CFLAGS) /MDd
246	LIBC = $(LIBC) msvcrtd.lib
247	! else
248	LIBC = $(LIBC) libcmtd.lib
249	! CFLAGS = $(CFLAGS) /MTd
250	! endif
251	!endif # DEBUG
252
253	***************
254	* 681,696 **
255	#
256	# Always generate the .pdb file, so that we get debug symbols that can be used
257	# on a crash (doesn't add overhead to the executable).
258	#
259	! CFLAGS = $(CFLAGS) /Zi /Fd$(OUTDIR)/
260	! LINK_PDB = /PDB:$(VIM).pdb -debug # -debug:full -debugtype:cv,fixup
261
262	#
263	# End extra feature include
264	#
265	!message
266
267	! conflags = /nologo /subsystem:$(SUBSYSTEM) /incremental:no
268
269	PATHDEF_SRC = $(OUTDIR)\pathdef.c
270
271	--- 727,744 ----
272	#
273	# Always generate the .pdb file, so that we get debug symbols that can be used
274	# on a crash (doesn't add overhead to the executable).
275	+ # Generate edit-and-continue debug info when no optimization - allows to
276	+ # debug more conveniently (able to look at variables which are in registers)
277	#
278	! CFLAGS = $(CFLAGS) /Fd$(OUTDIR)/ $(DEBUGINFO)
279	! LINK_PDB = /PDB:$(VIM).pdb -debug
280
281	#
282	# End extra feature include
283	#
284	!message
285
286	! conflags = /nologo /subsystem:$(SUBSYSTEM)
287
288	PATHDEF_SRC = $(OUTDIR)\pathdef.c
289
290	***************
291	* 702,712 **
292	conflags = $(conflags) /map /mapinfo:lines
293	!ENDIF
294
295	! LINKARGS1 = $(linkdebug) $(conflags) /nodefaultlib:libc
296	LINKARGS2 = $(CON_LIB) $(GUI_LIB) $(LIBC) $(OLE_LIB) user32.lib $(SNIFF_LIB) \
297	$(MZSCHEME_LIB) $(PERL_LIB) $(PYTHON_LIB) $(RUBY_LIB) \
298	$(TCL_LIB) $(NETBEANS_LIB) $(XPM_LIB) $(LINK_PDB)
299
300	all: $(VIM).exe vimrun.exe install.exe uninstal.exe xxd/xxd.exe \
301	GvimExt/gvimext.dll
302
303	--- 750,769 ----
304	conflags = $(conflags) /map /mapinfo:lines
305	!ENDIF
306
307	! LINKARGS1 = $(linkdebug) $(conflags)
308	LINKARGS2 = $(CON_LIB) $(GUI_LIB) $(LIBC) $(OLE_LIB) user32.lib $(SNIFF_LIB) \
309	$(MZSCHEME_LIB) $(PERL_LIB) $(PYTHON_LIB) $(RUBY_LIB) \
310	$(TCL_LIB) $(NETBEANS_LIB) $(XPM_LIB) $(LINK_PDB)
311
312	+ # Report link time code generation progress if used.
313	+ !ifdef NODEBUG
314	+ !if "$(MSVCVER)" == "8.0"
315	+ !if "$(OPTIMIZE)" != "SPACE"
316	+ LINKARGS1 = $(LINKARGS1) /LTCG:STATUS
317	+ !endif
318	+ !endif
319	+ !endif
320	+
321	all: $(VIM).exe vimrun.exe install.exe uninstal.exe xxd/xxd.exe \
322	GvimExt/gvimext.dll
323
324	***************
325	* 794,800 **
326
327	# Create a default rule for transforming .c files to .obj files in $(OUTDIR)
328	# Batch compilation is supported by nmake 1.62 (part of VS 5.0) and later)
329	! !IF "$(_NMAKE_VER)" == ""
330	.c{$(OUTDIR)/}.obj:
331	!ELSE
332	.c{$(OUTDIR)/}.obj::
333	--- 851,857 ----
334
335	# Create a default rule for transforming .c files to .obj files in $(OUTDIR)
336	# Batch compilation is supported by nmake 1.62 (part of VS 5.0) and later)
337	! !IF "$(MSVCVER)" == "4.0"
338	.c{$(OUTDIR)/}.obj:
339	!ELSE
340	.c{$(OUTDIR)/}.obj::
341	***************
342	* 803,809 **
343
344	# Create a default rule for transforming .cpp files to .obj files in $(OUTDIR)
345	# Batch compilation is supported by nmake 1.62 (part of VS 5.0) and later)
346	! !IF "$(_NMAKE_VER)" == ""
347	.cpp{$(OUTDIR)/}.obj:
348	!ELSE
349	.cpp{$(OUTDIR)/}.obj::
350	--- 860,866 ----
351
352	# Create a default rule for transforming .cpp files to .obj files in $(OUTDIR)
353	# Batch compilation is supported by nmake 1.62 (part of VS 5.0) and later)
354	! !IF "$(MSVCVER)" == "4.0"
355	.cpp{$(OUTDIR)/}.obj:
356	!ELSE
357	.cpp{$(OUTDIR)/}.obj::
358	*** ../vim-7.1.133/src/version.c Wed Oct 3 12:49:24 2007
359	--- src/version.c Wed Oct 3 13:23:51 2007
360	***************
361	* 668,669 **
362	--- 668,671 ----
363	{ /* Add new patch number below this line */
364	+ /**/
365	+ 134,
366	/**/
367
368	--
369	BLACK KNIGHT: The Black Knight always triumphs. Have at you!
370	ARTHUR takes his last leg off. The BLACK KNIGHT's body lands upright.
371	BLACK KNIGHT: All right, we'll call it a draw.
372	"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
373
374	/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
375	/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
376	\\\ download, build and distribute -- http://www.A-A-P.org ///
377	\\\ help me help AIDS victims -- http://ICCF-Holland.org ///