Mercurial > vim

diff src/Make_cyg_ming.mak @ 11719:13ecb3e64399 v8.0.0742

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.0.0742: terminal feature does not work on MS-Windows commit https://github.com/vim/vim/commit/8f84c3a8666cea04484ec93fa05386bf33f93f5a Author: Bram Moolenaar <Bram@vim.org> Date: Sat Jul 22 16:14:44 2017 +0200 patch 8.0.0742: terminal feature does not work on MS-Windows Problem: Terminal feature does not work on MS-Windows. Solution: Use libvterm and libwinpty on MS-Windows. (Yasuhiro Matsumoto)
author Christian Brabandt <cb@256bit.org>
date Sat, 22 Jul 2017 16:15:04 +0200
parents 0a6136dfce35
children edf1a2a247fa
line wrap: on
line diff
--- a/src/Make_cyg_ming.mak
+++ b/src/Make_cyg_ming.mak
@@ -750,6 +750,7 @@ endif
 
 ifeq ($(TERMINAL),yes)
 OBJ += $(OUTDIR)/terminal.o
+VTERM_LIB = libvterm/.libs/libvterm.a
 endif
 
 
@@ -849,7 +850,7 @@ uninstal.exe: uninstal.c
 	$(CC) $(CFLAGS) -o uninstal.exe uninstal.c $(LIB)
 
 $(TARGET): $(OUTDIR) $(OBJ)
-	$(CC) $(CFLAGS) $(LFLAGS) -o $@ $(OBJ) $(LIB) -lole32 -luuid $(LUA_LIB) $(MZSCHEME_LIBDIR) $(MZSCHEME_LIB) $(PYTHONLIB) $(PYTHON3LIB) $(RUBYLIB)
+	$(CC) $(CFLAGS) $(LFLAGS) -o $@ $(OBJ) $(LIB) -lole32 -luuid $(LUA_LIB) $(MZSCHEME_LIBDIR) $(MZSCHEME_LIB) $(PYTHONLIB) $(PYTHON3LIB) $(RUBYLIB) $(VTERM_LIB)
 
 upx: exes
 	upx gvim.exe
@@ -865,6 +866,9 @@ xxd/xxd.exe: xxd/xxd.c
 GvimExt/gvimext.dll: GvimExt/gvimext.cpp GvimExt/gvimext.rc GvimExt/gvimext.h
 	$(MAKE) -C GvimExt -f Make_ming.mak CROSS=$(CROSS) CROSS_COMPILE=$(CROSS_COMPILE) CXX='$(CXX)' STATIC_STDCPLUS=$(STATIC_STDCPLUS)
 
+libvterm/.libs/libvterm.a :
+	cd libvterm && $(MAKE) libvterm.la
+
 clean:
 	-$(DEL) $(OUTDIR)$(DIRSLASH)*.o
 	-$(DEL) $(OUTDIR)$(DIRSLASH)*.res