changeset 16507:7c6fe15778cf v8.1.1257

patch 8.1.1257: MSVC: name of object directory now always right commit https://github.com/vim/vim/commit/819d3e52a1eab35409ea7e0ebdb2340507a42684 Author: Bram Moolenaar <Bram@vim.org> Date: Fri May 3 22:15:03 2019 +0200 patch 8.1.1257: MSVC: name of object directory now always right 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)
author Bram Moolenaar <Bram@vim.org>
date Fri, 03 May 2019 22:30:05 +0200
parents a9fef3913baf
children 8f88df3abdc9
files src/Make_mvc.mak src/version.c
diffstat 2 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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,