# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1556915405 -7200
# Node ID 7c6fe15778cfc20abff9d72cad340f08f454c3a1
# Parent  a9fef3913bafd5229c9f4fae3ae38d772dbc7893
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)

diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
--- 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
--- 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,