diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-05-03 22:15:03 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-05-03 22:15:03 +0200 |
| commit | 819d3e52a1eab35409ea7e0ebdb2340507a42684 (patch) | |
| tree | 907e46f4b5767dc37e76359d004fcd08354c092a | |
| parent | 3ff33114d70fc0f7e9c3187c5fec9028f6499cf3 (diff) | |
| download | vim-git-8.1.1257.tar.gz | |
patch 8.1.1257: MSVC: name of object directory now always rightv8.1.1257
Problem: MSVC: name of object directory now always right.
Solution: Adjust comment. Don't use different directory for DIRECTX. Do
use different directory for USE_MSVCRT. (Ken Takata, closes #4333)
| -rw-r--r-- | src/Make_mvc.mak | 8 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak index 07ebb7559..2bbbb4782 100644 --- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -192,8 +192,7 @@ GUI = yes DIRECTX = $(GUI) !endif -# Select one of eight object code directories, depends on GUI, OLE, DEBUG and -# interfaces. +# Select a code directory, depends on GUI, OLE, DEBUG, interfaces and etc. # If you change something else, do "make clean" first! !if "$(VIMDLL)" == "yes" OBJDIR = .\ObjD @@ -202,7 +201,7 @@ OBJDIR = .\ObjG !else OBJDIR = .\ObjC !endif -!if "$(DIRECTX)" == "yes" +!if "$(DIRECTX)" == "yes" && "$(GUI)" == "yes" OBJDIR = $(OBJDIR)X !endif !if "$(OLE)" == "yes" @@ -229,6 +228,9 @@ OBJDIR = $(OBJDIR)R !ifdef MZSCHEME OBJDIR = $(OBJDIR)Z !endif +!ifdef USE_MSVCRT +OBJDIR = $(OBJDIR)V +!endif !if "$(DEBUG)" == "yes" OBJDIR = $(OBJDIR)d !endif diff --git a/src/version.c b/src/version.c index 35ef1ae7c..e5582e99e 100644 --- a/src/version.c +++ b/src/version.c @@ -768,6 +768,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1257, +/**/ 1256, /**/ 1255, |