updated for version 7.3.971

Problem:    No support for VS2012 static code analysis.
Solution:   Add the ANALYZE option. (Mike Williams)

diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index acd1346ab91db30a44812e3dcdf82731d2f74e5f..8857b96a0049974356e3dce6455a55e2b577ffc5 100644 (file)
--- 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 86c012fecb5e6aa327a07d3cbe528b6274d8c878..6604a694f972ea77d196a5aaac281017a79555f8 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    971,
 /**/
     970,
 /**/