diff options
| author | Bram Moolenaar <Bram@vim.org> | 2010-06-01 19:58:08 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2010-06-01 19:58:08 +0200 |
| commit | 83d09bb85e471135222f79b15de549f435e73fae (patch) | |
| tree | 83d2de1dab6c03a620190a2cecdac7edec4123be /src/Make_mvc.mak | |
| parent | 914703bee2422e2797576e06145380389096ec09 (diff) | |
Don't use pointers to store numbers, use a union.
Fixed MSVC makefile use of /Wp64 flag.
Diffstat (limited to 'src/Make_mvc.mak')
| -rw-r--r-- | src/Make_mvc.mak | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak index 695d352e73..5a123a8d9a 100644 --- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -208,11 +208,8 @@ MAKEFLAGS_GVIMEXT = DEBUG=yes !include <Win32.mak> -# Turn on Win64 compatibility warnings for VC7.x and VC8. -# (/Wp64 is deprecated in VC9 and generates an obnoxious warning.) -!if ("$(MSVCVER)" == "7.0") || ("$(MSVCVER)" == "7.1") || ("$(MSVCVER)" == "8.0") -DEFINES=$(DEFINES) /Wp64 -!endif +# May turn on Win64 compatibility warnings for VC7.x and VC8. +WP64CHECK = /Wp64 #>>>>> path of the compiler and linker; name of include and lib directories # PATH = c:\msvc20\bin;$(PATH) @@ -414,12 +411,19 @@ OPTFLAG = /O2 !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 !endif !endif + +# (/Wp64 is deprecated in VC9 and generates an obnoxious warning.) +!if ("$(MSVCVER)" == "7.0") || ("$(MSVCVER)" == "7.1") || ("$(MSVCVER)" == "8.0") +CFLAGS=$(CFLAGS) $(WP64CHECK) +!endif + CFLAGS = $(CFLAGS) $(OPTFLAG) -DNDEBUG $(CPUARG) RCFLAGS = $(rcflags) $(rcvars) -DNDEBUG ! ifdef USE_MSVCRT |