diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-07-24 22:29:21 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-07-24 22:29:21 +0200 |
| commit | 8a77306fa170f9d95f2402e73b4a94a2692ce84f (patch) | |
| tree | 1b02486ba966cc5ee70636ce9d62aea4e6f3dd5a /src/Make_mvc.mak | |
| parent | 2155441460a6dc0a72125f7860507693112a1460 (diff) | |
patch 8.0.0769: build problems with terminal on MS-Windowsv8.0.0769
Problem: Build problems with terminal on MS-Windows using MSVC.
Solution: Remove stdbool.h dependency. Only use ScreenLinesUC when it was
allocated. Fix typos. (Ken Takata)
Diffstat (limited to 'src/Make_mvc.mak')
| -rw-r--r-- | src/Make_mvc.mak | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak index 99dcb294dc..d51d9762a2 100644 --- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -356,6 +356,9 @@ CSCOPE_DEFS = -DFEAT_CSCOPE !if "$(TERMINAL)" == "yes" TERMINAL_OBJ = $(OBJDIR)/terminal.obj TERMINAL_DEFS = -DFEAT_TERMINAL +!if $(MSVC_MAJOR) <= 11 +TERMINAL_DEFS = $(TERMINAL_DEFS) /I if_perl_msvc +!endif TERMINAL_SRC = terminal.c VTERM_LIB = libvterm/vterm.lib !endif @@ -1154,7 +1157,7 @@ all: $(VIM).exe \ $(VIM).exe: $(OUTDIR) $(OBJ) $(GUI_OBJ) $(CUI_OBJ) $(OLE_OBJ) $(OLE_IDL) $(MZSCHEME_OBJ) \ $(LUA_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(PYTHON3_OBJ) $(RUBY_OBJ) $(TCL_OBJ) \ - $(CSCOPE_OBJ) $(TERMINAL_OBJ) $(NETBEANS_OBJ) $(CHANNEL_OBJ) $(XPM_OBJ) \ + $(CSCOPE_OBJ) $(TERMINAL_OBJ) $(NETBEANS_OBJ) $(CHANNEL_OBJ) $(XPM_OBJ) $(VTERM_LIB) \ version.c version.h $(CC) $(CFLAGS) version.c $(link) $(LINKARGS1) -out:$(VIM).exe $(OBJ) $(GUI_OBJ) $(CUI_OBJ) $(OLE_OBJ) \ @@ -1549,7 +1552,7 @@ proto.h: \ libvterm/vterm.lib : cd libvterm - $(MAKE) /NOLOGO -f Makefile.msc + $(MAKE) /NOLOGO -f Makefile.msc "MSVC_MAJOR=$(MSVC_MAJOR)" cd .. # vim: set noet sw=8 ts=8 sts=0 wm=0 tw=0: |