diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak index 1df4de8566..c13a211a3f 100644 --- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -631,6 +631,12 @@ CFLAGS = $(CFLAGS) /MP CFLAGS = $(CFLAGS) -DHAVE_STDINT_H !endif +# Static code analysis generally available starting with VS2012 (VC11) or +# Windows SDK 7.1 (VC10) +!if ("$(ANALYZE)" == "yes") && ($(MSVC_MAJOR) >= 10) +CFLAGS=$(CFLAGS) /analyze +!endif + !ifdef NODEBUG VIM = vim !if "$(OPTIMIZE)" == "SPACE" @@ -653,12 +659,6 @@ OPTFLAG = $(OPTFLAG) /GL CFLAGS=$(CFLAGS) $(WP64CHECK) !endif -# Static code analysis generally available starting with VS2012 (VC11) or -# Windows SDK 7.1 (VC10) -!if ("$(ANALYZE)" == "yes") && ($(MSVC_MAJOR) >= 10) -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 8b3bc69549..6302294bc3 100644 --- a/src/version.c +++ b/src/version.c @@ -779,6 +779,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1014, /**/ 1013, /**/