comparison src/Make_mvc.mak @ 14734:2c72fa16aa70 v8.1.0379

patch 8.1.0379: build dependencies are incomplete commit https://github.com/vim/vim/commit/78dcd4f002c41fff9c15434336f57210edc384f2 Author: Bram Moolenaar <Bram@vim.org> Date: Thu Sep 13 17:23:28 2018 +0200 patch 8.1.0379: build dependencies are incomplete Problem: Build dependencies are incomplete. Solution: Update the build dependencies, mainly for xdiff. Adjust object directory for libvterm and xdiff.
author Christian Brabandt <cb@256bit.org>
date Thu, 13 Sep 2018 17:30:05 +0200
parents 195e8b1fcbbf
children b65d7aba8d0d
comparison
equal deleted inserted replaced
14733:15d60eacdbc8 14734:2c72fa16aa70
378 !endif 378 !endif
379 379
380 !if "$(TERMINAL)" == "yes" 380 !if "$(TERMINAL)" == "yes"
381 TERM_OBJ = \ 381 TERM_OBJ = \
382 $(OBJDIR)/terminal.obj \ 382 $(OBJDIR)/terminal.obj \
383 $(OBJDIR)/term_encoding.obj \ 383 $(OBJDIR)/encoding.obj \
384 $(OBJDIR)/term_keyboard.obj \ 384 $(OBJDIR)/keyboard.obj \
385 $(OBJDIR)/term_mouse.obj \ 385 $(OBJDIR)/mouse.obj \
386 $(OBJDIR)/term_parser.obj \ 386 $(OBJDIR)/parser.obj \
387 $(OBJDIR)/term_pen.obj \ 387 $(OBJDIR)/pen.obj \
388 $(OBJDIR)/term_screen.obj \ 388 $(OBJDIR)/termscreen.obj \
389 $(OBJDIR)/term_state.obj \ 389 $(OBJDIR)/state.obj \
390 $(OBJDIR)/term_unicode.obj \ 390 $(OBJDIR)/unicode.obj \
391 $(OBJDIR)/term_vterm.obj 391 $(OBJDIR)/vterm.obj
392 TERM_DEFS = -DFEAT_TERMINAL 392 TERM_DEFS = -DFEAT_TERMINAL
393 TERM_DEPS = \ 393 TERM_DEPS = \
394 libvterm/include/vterm.h \ 394 libvterm/include/vterm.h \
395 libvterm/include/vterm_keycodes.h \ 395 libvterm/include/vterm_keycodes.h \
396 libvterm/src/rect.h \ 396 libvterm/src/rect.h \
1559 -DVSNPRINTF=vim_vsnprintf \ 1559 -DVSNPRINTF=vim_vsnprintf \
1560 -DIS_COMBINING_FUNCTION=utf_iscomposing_uint \ 1560 -DIS_COMBINING_FUNCTION=utf_iscomposing_uint \
1561 -DWCWIDTH_FUNCTION=utf_uint2cells \ 1561 -DWCWIDTH_FUNCTION=utf_uint2cells \
1562 -D_CRT_SECURE_NO_WARNINGS 1562 -D_CRT_SECURE_NO_WARNINGS
1563 1563
1564 $(OUTDIR)/term_encoding.obj: $(OUTDIR) libvterm/src/encoding.c $(TERM_DEPS) 1564 $(OUTDIR)/encoding.obj: $(OUTDIR) libvterm/src/encoding.c $(TERM_DEPS)
1565 $(CCCTERM) -Fo$@ libvterm/src/encoding.c 1565 $(CCCTERM) -Fo$@ libvterm/src/encoding.c
1566 1566
1567 $(OUTDIR)/term_keyboard.obj: $(OUTDIR) libvterm/src/keyboard.c $(TERM_DEPS) 1567 $(OUTDIR)/keyboard.obj: $(OUTDIR) libvterm/src/keyboard.c $(TERM_DEPS)
1568 $(CCCTERM) -Fo$@ libvterm/src/keyboard.c 1568 $(CCCTERM) -Fo$@ libvterm/src/keyboard.c
1569 1569
1570 $(OUTDIR)/term_mouse.obj: $(OUTDIR) libvterm/src/mouse.c $(TERM_DEPS) 1570 $(OUTDIR)/mouse.obj: $(OUTDIR) libvterm/src/mouse.c $(TERM_DEPS)
1571 $(CCCTERM) -Fo$@ libvterm/src/mouse.c 1571 $(CCCTERM) -Fo$@ libvterm/src/mouse.c
1572 1572
1573 $(OUTDIR)/term_parser.obj: $(OUTDIR) libvterm/src/parser.c $(TERM_DEPS) 1573 $(OUTDIR)/parser.obj: $(OUTDIR) libvterm/src/parser.c $(TERM_DEPS)
1574 $(CCCTERM) -Fo$@ libvterm/src/parser.c 1574 $(CCCTERM) -Fo$@ libvterm/src/parser.c
1575 1575
1576 $(OUTDIR)/term_pen.obj: $(OUTDIR) libvterm/src/pen.c $(TERM_DEPS) 1576 $(OUTDIR)/pen.obj: $(OUTDIR) libvterm/src/pen.c $(TERM_DEPS)
1577 $(CCCTERM) -Fo$@ libvterm/src/pen.c 1577 $(CCCTERM) -Fo$@ libvterm/src/pen.c
1578 1578
1579 $(OUTDIR)/term_screen.obj: $(OUTDIR) libvterm/src/screen.c $(TERM_DEPS) 1579 $(OUTDIR)/termscreen.obj: $(OUTDIR) libvterm/src/screen.c $(TERM_DEPS)
1580 $(CCCTERM) -Fo$@ libvterm/src/screen.c 1580 $(CCCTERM) -Fo$@ libvterm/src/screen.c
1581 1581
1582 $(OUTDIR)/term_state.obj: $(OUTDIR) libvterm/src/state.c $(TERM_DEPS) 1582 $(OUTDIR)/state.obj: $(OUTDIR) libvterm/src/state.c $(TERM_DEPS)
1583 $(CCCTERM) -Fo$@ libvterm/src/state.c 1583 $(CCCTERM) -Fo$@ libvterm/src/state.c
1584 1584
1585 $(OUTDIR)/term_unicode.obj: $(OUTDIR) libvterm/src/unicode.c $(TERM_DEPS) 1585 $(OUTDIR)/unicode.obj: $(OUTDIR) libvterm/src/unicode.c $(TERM_DEPS)
1586 $(CCCTERM) -Fo$@ libvterm/src/unicode.c 1586 $(CCCTERM) -Fo$@ libvterm/src/unicode.c
1587 1587
1588 $(OUTDIR)/term_vterm.obj: $(OUTDIR) libvterm/src/vterm.c $(TERM_DEPS) 1588 $(OUTDIR)/vterm.obj: $(OUTDIR) libvterm/src/vterm.c $(TERM_DEPS)
1589 $(CCCTERM) -Fo$@ libvterm/src/vterm.c 1589 $(CCCTERM) -Fo$@ libvterm/src/vterm.c
1590 1590
1591 1591
1592 # $CFLAGS may contain backslashes and double quotes, escape them both. 1592 # $CFLAGS may contain backslashes and double quotes, escape them both.
1593 E0_CFLAGS = $(CFLAGS:\=\\) 1593 E0_CFLAGS = $(CFLAGS:\=\\)