diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-03-17 15:47:25 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-03-17 15:47:25 +0100 |
| commit | 38db5276cd8f45fdf3dea8997e8994676e71b105 (patch) | |
| tree | a536145233d88a3fa821d56e5b6691d9c1425a33 | |
| parent | 3b5fef6a995f25a8a8f746896de44df49b69dfdf (diff) | |
| download | vim-git-38db5276cd8f45fdf3dea8997e8994676e71b105.tar.gz | |
patch 8.1.1014: MS-Windows: /analyze only defined for non-debug versionv8.1.1014
Problem: MS-Windows: /analyze only defined for non-debug version.
Solution: Move adding of /analyze up. (Taro Muraoka, closes #4114)
| -rw-r--r-- | src/Make_mvc.mak | 12 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak index 1df4de856..c13a211a3 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 8b3bc6954..6302294bc 100644 --- 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, |