From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 3 May 2019 20:15:03 +0000 (+0200)
Subject: patch 8.1.1257: MSVC: name of object directory now always right
X-Git-Tag: v8.1.1257
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=819d3e52a1eab35409ea7e0ebdb2340507a42684;p=thirdparty%2Fvim.git

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)
---

diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index 07ebb75592..2bbbb47829 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 35ef1ae7cc..e5582e99e7 100644
--- a/src/version.c
+++ b/src/version.c
@@ -767,6 +767,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1257,
 /**/
     1256,
 /**/