Mercurial > vim

comparison src/Make_mvc.mak @ 11774:edf1a2a247fa v8.0.0769

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.0.0769: build problems with terminal on MS-Windows commit https://github.com/vim/vim/commit/8a77306fa170f9d95f2402e73b4a94a2692ce84f Author: Bram Moolenaar <Bram@vim.org> Date: Mon Jul 24 22:29:21 2017 +0200 patch 8.0.0769: build problems with terminal on MS-Windows 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)
author Christian Brabandt <cb@256bit.org>
date Mon, 24 Jul 2017 22:30:04 +0200
parents 9dd958aba769
children 112427b2de52
comparison
equal deleted inserted replaced
11773:b6bf9043f424 11774:edf1a2a247fa
354 !endif 354 !endif
355 355
356 !if "$(TERMINAL)" == "yes" 356 !if "$(TERMINAL)" == "yes"
357 TERMINAL_OBJ = $(OBJDIR)/terminal.obj 357 TERMINAL_OBJ = $(OBJDIR)/terminal.obj
358 TERMINAL_DEFS = -DFEAT_TERMINAL 358 TERMINAL_DEFS = -DFEAT_TERMINAL
359 !if $(MSVC_MAJOR) <= 11
360 TERMINAL_DEFS = $(TERMINAL_DEFS) /I if_perl_msvc
361 !endif
359 TERMINAL_SRC = terminal.c 362 TERMINAL_SRC = terminal.c
360 VTERM_LIB = libvterm/vterm.lib 363 VTERM_LIB = libvterm/vterm.lib
361 !endif 364 !endif
362 365
363 !ifndef NETBEANS 366 !ifndef NETBEANS
1152 tee/tee.exe \ 1155 tee/tee.exe \
1153 GvimExt/gvimext.dll 1156 GvimExt/gvimext.dll
1154 1157
1155 $(VIM).exe: $(OUTDIR) $(OBJ) $(GUI_OBJ) $(CUI_OBJ) $(OLE_OBJ) $(OLE_IDL) $(MZSCHEME_OBJ) \ 1158 $(VIM).exe: $(OUTDIR) $(OBJ) $(GUI_OBJ) $(CUI_OBJ) $(OLE_OBJ) $(OLE_IDL) $(MZSCHEME_OBJ) \
1156 $(LUA_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(PYTHON3_OBJ) $(RUBY_OBJ) $(TCL_OBJ) \ 1159 $(LUA_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(PYTHON3_OBJ) $(RUBY_OBJ) $(TCL_OBJ) \
1157 $(CSCOPE_OBJ) $(TERMINAL_OBJ) $(NETBEANS_OBJ) $(CHANNEL_OBJ) $(XPM_OBJ) \ 1160 $(CSCOPE_OBJ) $(TERMINAL_OBJ) $(NETBEANS_OBJ) $(CHANNEL_OBJ) $(XPM_OBJ) $(VTERM_LIB) \
1158 version.c version.h 1161 version.c version.h
1159 $(CC) $(CFLAGS) version.c 1162 $(CC) $(CFLAGS) version.c
1160 $(link) $(LINKARGS1) -out:$(VIM).exe $(OBJ) $(GUI_OBJ) $(CUI_OBJ) $(OLE_OBJ) \ 1163 $(link) $(LINKARGS1) -out:$(VIM).exe $(OBJ) $(GUI_OBJ) $(CUI_OBJ) $(OLE_OBJ) \
1161 $(LUA_OBJ) $(MZSCHEME_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(PYTHON3_OBJ) $(RUBY_OBJ) \ 1164 $(LUA_OBJ) $(MZSCHEME_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(PYTHON3_OBJ) $(RUBY_OBJ) \
1162 $(TCL_OBJ) $(CSCOPE_OBJ) $(TERMINAL_OBJ) $(NETBEANS_OBJ) $(CHANNEL_OBJ) \ 1165 $(TCL_OBJ) $(CSCOPE_OBJ) $(TERMINAL_OBJ) $(NETBEANS_OBJ) $(CHANNEL_OBJ) \
1547 .c.i: 1550 .c.i:
1548 $(CC) $(CFLAGS) /P /C $< 1551 $(CC) $(CFLAGS) /P /C $<
1549 1552
1550 libvterm/vterm.lib : 1553 libvterm/vterm.lib :
1551 cd libvterm 1554 cd libvterm
1552 $(MAKE) /NOLOGO -f Makefile.msc 1555 $(MAKE) /NOLOGO -f Makefile.msc "MSVC_MAJOR=$(MSVC_MAJOR)"
1553 cd .. 1556 cd ..
1554 1557
1555 # vim: set noet sw=8 ts=8 sts=0 wm=0 tw=0: 1558 # vim: set noet sw=8 ts=8 sts=0 wm=0 tw=0: