From 91df7588be3fba56db6ab7dc41cafafbb28d67b1 Mon Sep 17 00:00:00 2001 From: "K.Takata" Date: Fri, 3 May 2019 22:45:59 +0900 Subject: [PATCH] msvc: Adjust the object directory * Update a comment. It's not one of eight directories. It's now 1/3072. * Don't add 'X' infix for CUI even when `DIRECTX=yes`. No need to use a different directory. * Use different object directory for `USE_MSVCRT`. --- src/Make_mvc.mak | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak index 07ebb75592a17..2bbbb47829c69 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