Mercurial > vim

comparison src/Make_mvc.mak @ 11747:9dd958aba769 v8.0.0756

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.0.0756: cannot build libvterm with MSVC commit https://github.com/vim/vim/commit/2aeaf3fc013a3c4828d6e98a80e6a2e2d980f109 Author: Bram Moolenaar <Bram@vim.org> Date: Sun Jul 23 17:11:15 2017 +0200 patch 8.0.0756: cannot build libvterm with MSVC Problem: Cannot build libvterm with MSVC. Solution: Add an MSVC Makefile to libvterm. (Yasuhiro Matsumoto, closes #1865)
author Christian Brabandt <cb@256bit.org>
date Sun, 23 Jul 2017 17:15:03 +0200
parents 0a6136dfce35
children edf1a2a247fa
comparison
equal deleted inserted replaced
11746:9b1e4fbfa6db 11747:9dd958aba769
33 # 33 #
34 # IME support: IME=yes (requires GUI=yes) 34 # IME support: IME=yes (requires GUI=yes)
35 # DYNAMIC_IME=[yes or no] (to load the imm32.dll dynamically, default 35 # DYNAMIC_IME=[yes or no] (to load the imm32.dll dynamically, default
36 # is yes) 36 # is yes)
37 # Global IME support: GIME=yes (requires GUI=yes) 37 # Global IME support: GIME=yes (requires GUI=yes)
38 #
39 # Terminal support: TERMINAL=yes (default is no)
38 # 40 #
39 # Lua interface: 41 # Lua interface:
40 # LUA=[Path to Lua directory] 42 # LUA=[Path to Lua directory]
41 # DYNAMIC_LUA=yes (to load the Lua DLL dynamically) 43 # DYNAMIC_LUA=yes (to load the Lua DLL dynamically)
42 # LUA_VER=[Lua version] (default is 53) 44 # LUA_VER=[Lua version] (default is 53)
352 !endif 354 !endif
353 355
354 !if "$(TERMINAL)" == "yes" 356 !if "$(TERMINAL)" == "yes"
355 TERMINAL_OBJ = $(OBJDIR)/terminal.obj 357 TERMINAL_OBJ = $(OBJDIR)/terminal.obj
356 TERMINAL_DEFS = -DFEAT_TERMINAL 358 TERMINAL_DEFS = -DFEAT_TERMINAL
357 TERMINAL_SRC = terminal.c 359 TERMINAL_SRC = terminal.c
360 VTERM_LIB = libvterm/vterm.lib
358 !endif 361 !endif
359 362
360 !ifndef NETBEANS 363 !ifndef NETBEANS
361 NETBEANS = $(GUI) 364 NETBEANS = $(GUI)
362 !endif 365 !endif
1128 !ENDIF 1131 !ENDIF
1129 1132
1130 LINKARGS1 = $(linkdebug) $(conflags) 1133 LINKARGS1 = $(linkdebug) $(conflags)
1131 LINKARGS2 = $(CON_LIB) $(GUI_LIB) $(NODEFAULTLIB) $(LIBC) $(OLE_LIB) user32.lib \ 1134 LINKARGS2 = $(CON_LIB) $(GUI_LIB) $(NODEFAULTLIB) $(LIBC) $(OLE_LIB) user32.lib \
1132 $(LUA_LIB) $(MZSCHEME_LIB) $(PERL_LIB) $(PYTHON_LIB) $(PYTHON3_LIB) $(RUBY_LIB) \ 1135 $(LUA_LIB) $(MZSCHEME_LIB) $(PERL_LIB) $(PYTHON_LIB) $(PYTHON3_LIB) $(RUBY_LIB) \
1133 $(TCL_LIB) $(NETBEANS_LIB) $(XPM_LIB) $(LINK_PDB) 1136 $(TCL_LIB) $(NETBEANS_LIB) $(VTERM_LIB) $(XPM_LIB) $(LINK_PDB)
1134 1137
1135 # Report link time code generation progress if used. 1138 # Report link time code generation progress if used.
1136 !ifdef NODEBUG 1139 !ifdef NODEBUG
1137 !if $(MSVC_MAJOR) >= 8 1140 !if $(MSVC_MAJOR) >= 8
1138 !if "$(OPTIMIZE)" != "SPACE" 1141 !if "$(OPTIMIZE)" != "SPACE"
1542 1545
1543 # Generate foo.i (preprocessor listing) from foo.c via "nmake foo.i" 1546 # Generate foo.i (preprocessor listing) from foo.c via "nmake foo.i"
1544 .c.i: 1547 .c.i:
1545 $(CC) $(CFLAGS) /P /C $< 1548 $(CC) $(CFLAGS) /P /C $<
1546 1549
1550 libvterm/vterm.lib :
1551 cd libvterm
1552 $(MAKE) /NOLOGO -f Makefile.msc
1553 cd ..
1547 1554
1548 # vim: set noet sw=8 ts=8 sts=0 wm=0 tw=0: 1555 # vim: set noet sw=8 ts=8 sts=0 wm=0 tw=0: