# HG changeset patch # User Bram Moolenaar # Date 1552834805 -3600 # Node ID 6230ff29c39ae27a85eb6d8433bc760e89dc0264 # Parent a1f884a6e3084c0e989b18dcbf772bbdc3fbd0fe patch 8.1.1014: MS-Windows: /analyze only defined for non-debug version commit https://github.com/vim/vim/commit/38db5276cd8f45fdf3dea8997e8994676e71b105 Author: Bram Moolenaar Date: Sun Mar 17 15:47:25 2019 +0100 patch 8.1.1014: MS-Windows: /analyze only defined for non-debug version Problem: MS-Windows: /analyze only defined for non-debug version. Solution: Move adding of /analyze up. (Taro Muraoka, closes https://github.com/vim/vim/issues/4114) diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak --- 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 --- a/src/version.c +++ b/src/version.c @@ -780,6 +780,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1014, +/**/ 1013, /**/ 1012,