diff options
| author | Bram Moolenaar <bram@vim.org> | 2013-05-19 21:03:54 +0200 |
|---|---|---|
| committer | Bram Moolenaar <bram@vim.org> | 2013-05-19 21:03:54 +0200 |
| commit | 6ac176af5401e33318c6cbaa639a3619fb1b4e4c (patch) | |
| tree | 8e04d999b709a5195c582b6cf1059eb295881613 | |
| parent | 50f5247356edac6830e5be861c6c5f476680e015 (diff) | |
| download | vim-6ac176af5401e33318c6cbaa639a3619fb1b4e4c.tar.gz | |
Problem: No support for VS2012 static code analysis.
Solution: Add the ANALYZE option. (Mike Williams)
| -rw-r--r-- | src/Make_mvc.mak | 33 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 22 insertions, 13 deletions
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak index acd1346a..8857b96a 100644 --- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -20,7 +20,7 @@ # # !!!! After changing features do "nmake clean" first !!!! # -# Feature Set: FEATURES=[TINY, SMALL, NORMAL, BIG, HUGE] (default is BIG) +# Feature Set: FEATURES=[TINY, SMALL, NORMAL, BIG, HUGE] (default is BIG) # # GUI interface: GUI=yes (default is no) # @@ -87,20 +87,20 @@ # GETTEXT=[yes or no] (default is yes) # See http://sourceforge.net/projects/gettext/ # -# PostScript printing: POSTSCRIPT=yes (default is no) +# PostScript printing: POSTSCRIPT=yes (default is no) # -# Netbeans Support: NETBEANS=[yes or no] (default is yes if GUI is yes) +# Netbeans Support: NETBEANS=[yes or no] (default is yes if GUI is yes) # -# XPM Image Support: XPM=[path to XPM directory] -# Default is "xpm", using the files included in the distribution. -# Use "no" to disable this feature. +# XPM Image Support: XPM=[path to XPM directory] +# Default is "xpm", using the files included in the distribution. +# Use "no" to disable this feature. # -# Optimization: OPTIMIZE=[SPACE, SPEED, MAXSPEED] (default is MAXSPEED) +# Optimization: OPTIMIZE=[SPACE, SPEED, MAXSPEED] (default is MAXSPEED) # -# Processor Version: CPUNR=[i386, i486, i586, i686, pentium4] (default is -# i386) +# Processor Version: CPUNR=[i386, i486, i586, i686, pentium4] (default is +# i386) # -# Version Support: WINVER=[0x0400, 0x0500] (default is 0x0400) +# Version Support: WINVER=[0x0400, 0x0500] (default is 0x0400) # # Debug version: DEBUG=yes # Mapfile: MAP=[no, yes or lines] (default is yes) @@ -108,10 +108,12 @@ # yes: Write a normal mapfile. # lines: Write a mapfile with line numbers (only for VC6 and later) # -# Netbeans Debugging Support: NBDEBUG=[yes or no] (should be no, yes -# doesn't work) +# 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) +# Visual C Version: MSVCVER=m.n (default derived from nmake if undefined) +# +# Static Code Analysis: ANALYZE=yes (works with VS2012 only) # # You can combine any of these interfaces # @@ -479,6 +481,11 @@ OPTFLAG = $(OPTFLAG) /GL CFLAGS=$(CFLAGS) $(WP64CHECK) !endif +# Static code analysis generally available starting with VS2012 +!if ("$(ANALYZE)" == "yes") && ("$(MSVCVER)" == "11.0") +CFLAGS=$(CFLAGS) /analyze +!endif + CFLAGS = $(CFLAGS) $(OPTFLAG) -DNDEBUG $(CPUARG) RCFLAGS = $(rcflags) $(rcvars) -DNDEBUG ! ifdef USE_MSVCRT diff --git a/src/version.c b/src/version.c index 86c012fe..6604a694 100644 --- a/src/version.c +++ b/src/version.c @@ -729,6 +729,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 971, +/**/ 970, /**/ 969, |