Mercurial > vim

changeset 16017:6230ff29c39a v8.1.1014

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.1014: MS-Windows: /analyze only defined for non-debug version commit https://github.com/vim/vim/commit/38db5276cd8f45fdf3dea8997e8994676e71b105 Author: Bram Moolenaar <Bram@vim.org> 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)
author Bram Moolenaar <Bram@vim.org>
date Sun, 17 Mar 2019 16:00:05 +0100
parents a1f884a6e308
children aa208549a80b
files src/Make_mvc.mak src/version.c
diffstat 2 files changed, 8 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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,