Skip to content

Commit

Permalink
msvc: Adjust the object directory
Browse files Browse the repository at this point in the history
* 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`.
  • Loading branch information
k-takata committed May 3, 2019
1 parent 92fd599 commit 91df758
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions src/Make_mvc.mak
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand All @@ -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
Expand Down

0 comments on commit 91df758

Please sign in to comment.