Mercurial > vim

comparison src/Make_mvc.mak @ 2242:bc4685345719 vim73

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't use pointers to store numbers, use a union. Fixed MSVC makefile use of /Wp64 flag.
author Bram Moolenaar <bram@vim.org>
date Tue, 01 Jun 2010 19:58:08 +0200
parents b1c70c500de4
children 03a5f2897db3
comparison
equal deleted inserted replaced
2241:60da25e3aab7 2242:bc4685345719
206 206
207 # Get all sorts of useful, standard macros from the Platform SDK. 207 # Get all sorts of useful, standard macros from the Platform SDK.
208 208
209 !include <Win32.mak> 209 !include <Win32.mak>
210 210
211 # Turn on Win64 compatibility warnings for VC7.x and VC8. 211 # May turn on Win64 compatibility warnings for VC7.x and VC8.
212 # (/Wp64 is deprecated in VC9 and generates an obnoxious warning.) 212 WP64CHECK = /Wp64
213 !if ("$(MSVCVER)" == "7.0") || ("$(MSVCVER)" == "7.1") || ("$(MSVCVER)" == "8.0")
214 DEFINES=$(DEFINES) /Wp64
215 !endif
216 213
217 #>>>>> path of the compiler and linker; name of include and lib directories 214 #>>>>> path of the compiler and linker; name of include and lib directories
218 # PATH = c:\msvc20\bin;$(PATH) 215 # PATH = c:\msvc20\bin;$(PATH)
219 # INCLUDE = c:\msvc20\include 216 # INCLUDE = c:\msvc20\include
220 # LIB = c:\msvc20\lib 217 # LIB = c:\msvc20\lib
412 !elseif "$(OPTIMIZE)" == "SPEED" 409 !elseif "$(OPTIMIZE)" == "SPEED"
413 OPTFLAG = /O2 410 OPTFLAG = /O2
414 !else # MAXSPEED 411 !else # MAXSPEED
415 OPTFLAG = /Ox 412 OPTFLAG = /Ox
416 !endif 413 !endif
414
417 !if ("$(MSVCVER)" == "8.0") || ("$(MSVCVER)" == "9.0") || ("$(MSVCVER)" == "10.0") 415 !if ("$(MSVCVER)" == "8.0") || ("$(MSVCVER)" == "9.0") || ("$(MSVCVER)" == "10.0")
418 # Use link time code generation if not worried about size 416 # Use link time code generation if not worried about size
419 !if "$(OPTIMIZE)" != "SPACE" 417 !if "$(OPTIMIZE)" != "SPACE"
420 OPTFLAG = $(OPTFLAG) /GL 418 OPTFLAG = $(OPTFLAG) /GL
421 !endif 419 !endif
422 !endif 420 !endif
421
422 # (/Wp64 is deprecated in VC9 and generates an obnoxious warning.)
423 !if ("$(MSVCVER)" == "7.0") || ("$(MSVCVER)" == "7.1") || ("$(MSVCVER)" == "8.0")
424 CFLAGS=$(CFLAGS) $(WP64CHECK)
425 !endif
426
423 CFLAGS = $(CFLAGS) $(OPTFLAG) -DNDEBUG $(CPUARG) 427 CFLAGS = $(CFLAGS) $(OPTFLAG) -DNDEBUG $(CPUARG)
424 RCFLAGS = $(rcflags) $(rcvars) -DNDEBUG 428 RCFLAGS = $(rcflags) $(rcvars) -DNDEBUG
425 ! ifdef USE_MSVCRT 429 ! ifdef USE_MSVCRT
426 CFLAGS = $(CFLAGS) /MD 430 CFLAGS = $(CFLAGS) /MD
427 LIBC = msvcrt.lib 431 LIBC = msvcrt.lib