Mercurial > vim
comparison src/Make_mvc.mak @ 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 | 7ae2396cef62 |
| children | 09f560dde6be |
comparison
equal
deleted
inserted
replaced
| 16506:a9fef3913baf | 16507:7c6fe15778cf |
|---|---|
| 190 | 190 |
| 191 !ifndef DIRECTX | 191 !ifndef DIRECTX |
| 192 DIRECTX = $(GUI) | 192 DIRECTX = $(GUI) |
| 193 !endif | 193 !endif |
| 194 | 194 |
| 195 # Select one of eight object code directories, depends on GUI, OLE, DEBUG and | 195 # Select a code directory, depends on GUI, OLE, DEBUG, interfaces and etc. |
| 196 # interfaces. | |
| 197 # If you change something else, do "make clean" first! | 196 # If you change something else, do "make clean" first! |
| 198 !if "$(VIMDLL)" == "yes" | 197 !if "$(VIMDLL)" == "yes" |
| 199 OBJDIR = .\ObjD | 198 OBJDIR = .\ObjD |
| 200 !elseif "$(GUI)" == "yes" | 199 !elseif "$(GUI)" == "yes" |
| 201 OBJDIR = .\ObjG | 200 OBJDIR = .\ObjG |
| 202 !else | 201 !else |
| 203 OBJDIR = .\ObjC | 202 OBJDIR = .\ObjC |
| 204 !endif | 203 !endif |
| 205 !if "$(DIRECTX)" == "yes" | 204 !if "$(DIRECTX)" == "yes" && "$(GUI)" == "yes" |
| 206 OBJDIR = $(OBJDIR)X | 205 OBJDIR = $(OBJDIR)X |
| 207 !endif | 206 !endif |
| 208 !if "$(OLE)" == "yes" | 207 !if "$(OLE)" == "yes" |
| 209 OBJDIR = $(OBJDIR)O | 208 OBJDIR = $(OBJDIR)O |
| 210 !endif | 209 !endif |
| 226 !ifdef RUBY | 225 !ifdef RUBY |
| 227 OBJDIR = $(OBJDIR)R | 226 OBJDIR = $(OBJDIR)R |
| 228 !endif | 227 !endif |
| 229 !ifdef MZSCHEME | 228 !ifdef MZSCHEME |
| 230 OBJDIR = $(OBJDIR)Z | 229 OBJDIR = $(OBJDIR)Z |
| 230 !endif | |
| 231 !ifdef USE_MSVCRT | |
| 232 OBJDIR = $(OBJDIR)V | |
| 231 !endif | 233 !endif |
| 232 !if "$(DEBUG)" == "yes" | 234 !if "$(DEBUG)" == "yes" |
| 233 OBJDIR = $(OBJDIR)d | 235 OBJDIR = $(OBJDIR)d |
| 234 !endif | 236 !endif |
| 235 | 237 |