Mercurial > vim

comparison src/Make_mvc.mak @ 11696:0a6136dfce35 v8.0.0731

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.0.0731: cannot build the terminal feature on MS-Windows commit https://github.com/vim/vim/commit/4fc63505d393451ad3780dc0390cb48587597aaf Author: Bram Moolenaar <Bram@vim.org> Date: Wed Jul 19 11:28:17 2017 +0200 patch 8.0.0731: cannot build the terminal feature on MS-Windows Problem: Cannot build the terminal feature on MS-Windows. Solution: Add the Makefile changes. (Yasuhiro Matsumoto, closes https://github.com/vim/vim/issues/1851)
author Christian Brabandt <cb@256bit.org>
date Wed, 19 Jul 2017 11:30:03 +0200
parents deb9295dccda
children 9dd958aba769
comparison
equal deleted inserted replaced
11695:914b6ba36fe4 11696:0a6136dfce35
349 CSCOPE_INCL = if_cscope.h 349 CSCOPE_INCL = if_cscope.h
350 CSCOPE_OBJ = $(OBJDIR)/if_cscope.obj 350 CSCOPE_OBJ = $(OBJDIR)/if_cscope.obj
351 CSCOPE_DEFS = -DFEAT_CSCOPE 351 CSCOPE_DEFS = -DFEAT_CSCOPE
352 !endif 352 !endif
353 353
354 !if "$(TERMINAL)" == "yes"
355 TERMINAL_OBJ = $(OBJDIR)/terminal.obj
356 TERMINAL_DEFS = -DFEAT_TERMINAL
357 TERMINAL_SRC = terminal.c
358 !endif
359
354 !ifndef NETBEANS 360 !ifndef NETBEANS
355 NETBEANS = $(GUI) 361 NETBEANS = $(GUI)
356 !endif 362 !endif
357 363
358 !ifndef CHANNEL 364 !ifndef CHANNEL
456 # default, use these lines. 462 # default, use these lines.
457 #VIMRCLOC = somewhere 463 #VIMRCLOC = somewhere
458 #VIMRUNTIMEDIR = somewhere 464 #VIMRUNTIMEDIR = somewhere
459 465
460 CFLAGS = -c /W3 /nologo $(CVARS) -I. -Iproto -DHAVE_PATHDEF -DWIN32 \ 466 CFLAGS = -c /W3 /nologo $(CVARS) -I. -Iproto -DHAVE_PATHDEF -DWIN32 \
461 $(CSCOPE_DEFS) $(NETBEANS_DEFS) $(CHANNEL_DEFS) \ 467 $(CSCOPE_DEFS) $(TERMINAL_DEFS) $(NETBEANS_DEFS) $(CHANNEL_DEFS) \
462 $(NBDEBUG_DEFS) $(XPM_DEFS) \ 468 $(NBDEBUG_DEFS) $(XPM_DEFS) \
463 $(DEFINES) -DWINVER=$(WINVER) -D_WIN32_WINNT=$(WINVER) \ 469 $(DEFINES) -DWINVER=$(WINVER) -D_WIN32_WINNT=$(WINVER) \
464 /Fo$(OUTDIR)/ 470 /Fo$(OUTDIR)/
465 471
466 #>>>>> end of choices 472 #>>>>> end of choices
1143 tee/tee.exe \ 1149 tee/tee.exe \
1144 GvimExt/gvimext.dll 1150 GvimExt/gvimext.dll
1145 1151
1146 $(VIM).exe: $(OUTDIR) $(OBJ) $(GUI_OBJ) $(CUI_OBJ) $(OLE_OBJ) $(OLE_IDL) $(MZSCHEME_OBJ) \ 1152 $(VIM).exe: $(OUTDIR) $(OBJ) $(GUI_OBJ) $(CUI_OBJ) $(OLE_OBJ) $(OLE_IDL) $(MZSCHEME_OBJ) \
1147 $(LUA_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(PYTHON3_OBJ) $(RUBY_OBJ) $(TCL_OBJ) \ 1153 $(LUA_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(PYTHON3_OBJ) $(RUBY_OBJ) $(TCL_OBJ) \
1148 $(CSCOPE_OBJ) $(NETBEANS_OBJ) $(CHANNEL_OBJ) $(XPM_OBJ) \ 1154 $(CSCOPE_OBJ) $(TERMINAL_OBJ) $(NETBEANS_OBJ) $(CHANNEL_OBJ) $(XPM_OBJ) \
1149 version.c version.h 1155 version.c version.h
1150 $(CC) $(CFLAGS) version.c 1156 $(CC) $(CFLAGS) version.c
1151 $(link) $(LINKARGS1) -out:$(VIM).exe $(OBJ) $(GUI_OBJ) $(CUI_OBJ) $(OLE_OBJ) \ 1157 $(link) $(LINKARGS1) -out:$(VIM).exe $(OBJ) $(GUI_OBJ) $(CUI_OBJ) $(OLE_OBJ) \
1152 $(LUA_OBJ) $(MZSCHEME_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(PYTHON3_OBJ) $(RUBY_OBJ) \ 1158 $(LUA_OBJ) $(MZSCHEME_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(PYTHON3_OBJ) $(RUBY_OBJ) \
1153 $(TCL_OBJ) $(CSCOPE_OBJ) $(NETBEANS_OBJ) $(CHANNEL_OBJ) \ 1159 $(TCL_OBJ) $(CSCOPE_OBJ) $(TERMINAL_OBJ) $(NETBEANS_OBJ) $(CHANNEL_OBJ) \
1154 $(XPM_OBJ) $(OUTDIR)\version.obj $(LINKARGS2) 1160 $(XPM_OBJ) $(OUTDIR)\version.obj $(LINKARGS2)
1155 if exist $(VIM).exe.manifest mt.exe -nologo -manifest $(VIM).exe.manifest -updateresource:$(VIM).exe;1 1161 if exist $(VIM).exe.manifest mt.exe -nologo -manifest $(VIM).exe.manifest -updateresource:$(VIM).exe;1
1156 1162
1157 $(VIM): $(VIM).exe 1163 $(VIM): $(VIM).exe
1158 1164
1381 $(OUTDIR)/option.obj: $(OUTDIR) option.c $(INCL) 1387 $(OUTDIR)/option.obj: $(OUTDIR) option.c $(INCL)
1382 1388
1383 $(OUTDIR)/ops.obj: $(OUTDIR) ops.c $(INCL) 1389 $(OUTDIR)/ops.obj: $(OUTDIR) ops.c $(INCL)
1384 1390
1385 $(OUTDIR)/os_mswin.obj: $(OUTDIR) os_mswin.c $(INCL) 1391 $(OUTDIR)/os_mswin.obj: $(OUTDIR) os_mswin.c $(INCL)
1392
1393 $(OUTDIR)/terminal.obj: $(OUTDIR) terminal.c $(INCL)
1386 1394
1387 $(OUTDIR)/winclip.obj: $(OUTDIR) winclip.c $(INCL) 1395 $(OUTDIR)/winclip.obj: $(OUTDIR) winclip.c $(INCL)
1388 1396
1389 $(OUTDIR)/os_win32.obj: $(OUTDIR) os_win32.c $(INCL) os_win32.h 1397 $(OUTDIR)/os_win32.obj: $(OUTDIR) os_win32.c $(INCL) os_win32.h
1390 1398