thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 9.1.0519: MS-Windows: libvterm compilation can be optimized

Browse Source 
Problem:  MS-Windows: libvterm compilation can be optimized
Solution: Enable batch inference for libvterm (Ken Takata)

Enable batch inference for libvterm by using $(OBJDIR)/libvterm as the
object directory. This should make the compilation process a bit faster.

closes: #15118

Signed-off-by: Ken Takata <kentkt@csc.jp>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Ken Takata
2024-07-04 13:31:25 +02:00
committed by Christian Brabandt
parent 9987fe8ca0
commit 9554ace1d9
2 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/Make_mvc.mak
View File

@@ -384,15 +384,15 @@ TERMINAL = no
!if "$(TERMINAL)" == "yes" !if "$(TERMINAL)" == "yes"
TERM_OBJ = \ TERM_OBJ = \
$(OBJDIR)/terminal.obj \ $(OBJDIR)/terminal.obj \
$(OBJDIR)/vterm_encoding.obj \ $(OBJDIR)/libvterm/encoding.obj \
$(OBJDIR)/vterm_keyboard.obj \ $(OBJDIR)/libvterm/keyboard.obj \
$(OBJDIR)/vterm_mouse.obj \ $(OBJDIR)/libvterm/mouse.obj \
$(OBJDIR)/vterm_parser.obj \ $(OBJDIR)/libvterm/parser.obj \
$(OBJDIR)/vterm_pen.obj \ $(OBJDIR)/libvterm/pen.obj \
$(OBJDIR)/vterm_screen.obj \ $(OBJDIR)/libvterm/screen.obj \
$(OBJDIR)/vterm_state.obj \ $(OBJDIR)/libvterm/state.obj \
$(OBJDIR)/vterm_unicode.obj \ $(OBJDIR)/libvterm/unicode.obj \
$(OBJDIR)/vterm_vterm.obj $(OBJDIR)/libvterm/vterm.obj
TERM_DEFS = -DFEAT_TERMINAL TERM_DEFS = -DFEAT_TERMINAL
TERM_DEPS = \ TERM_DEPS = \
libvterm/include/vterm.h \ libvterm/include/vterm.h \
@@ -1330,6 +1330,9 @@ $(VIM): $(VIM).exe
$(OUTDIR): $(OUTDIR):
if not exist $(OUTDIR)/nul mkdir $(OUTDIR:/=\) if not exist $(OUTDIR)/nul mkdir $(OUTDIR:/=\)
$(OUTDIR)/libvterm: $(OUTDIR)
if not exist $(OUTDIR)/libvterm/nul mkdir $(OUTDIR:/=\)\libvterm
CFLAGS_INST = /nologo /O2 -DNDEBUG -DWIN32 -DWINVER=$(WINVER) \ CFLAGS_INST = /nologo /O2 -DNDEBUG -DWIN32 -DWINVER=$(WINVER) \
-D_WIN32_WINNT=$(WINVER) $(CFLAGS_DEPR) -D_WIN32_WINNT=$(WINVER) $(CFLAGS_DEPR)
@@ -1483,15 +1486,15 @@ test_vim9:
########################################################################### ###########################################################################
# Create a default rule for transforming .c files to .obj files in $(OUTDIR) # Create a default rule for transforming .c files to .obj files in $(OUTDIR)
.c{$(OUTDIR)/}.obj:: .c{$(OUTDIR)}.obj::
$(CC) $(CFLAGS_OUTDIR) $< $(CC) $(CFLAGS_OUTDIR) $<
# Create a default rule for xdiff. # Create a default rule for xdiff.
{xdiff/}.c{$(OUTDIR)/}.obj:: {xdiff}.c{$(OUTDIR)}.obj::
$(CC) $(CFLAGS_OUTDIR) $< $(CC) $(CFLAGS_OUTDIR) $<
# Create a default rule for transforming .cpp files to .obj files in $(OUTDIR) # Create a default rule for transforming .cpp files to .obj files in $(OUTDIR)
.cpp{$(OUTDIR)/}.obj:: .cpp{$(OUTDIR)}.obj::
$(CC) $(CFLAGS_OUTDIR) $< $(CC) $(CFLAGS_OUTDIR) $<
$(OUTDIR)/alloc.obj: $(OUTDIR) alloc.c $(INCL) $(OUTDIR)/alloc.obj: $(OUTDIR) alloc.c $(INCL)
@@ -1837,32 +1840,27 @@ CCCTERM = $(CC) $(CFLAGS) -Ilibvterm/include -DINLINE="" \
-DGET_SPECIAL_PTY_TYPE_FUNCTION=get_special_pty_type \ -DGET_SPECIAL_PTY_TYPE_FUNCTION=get_special_pty_type \
-D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS
$(OUTDIR)/vterm_encoding.obj: $(OUTDIR) libvterm/src/encoding.c $(TERM_DEPS) # Create a default rule for vterm.
$(CCCTERM) /Fo$@ libvterm/src/encoding.c {libvterm/src}.c{$(OUTDIR)/libvterm}.obj::
$(CCCTERM) /Fo$(OUTDIR)/libvterm/ $<
$(OUTDIR)/vterm_keyboard.obj: $(OUTDIR) libvterm/src/keyboard.c $(TERM_DEPS) $(OUTDIR)/libvterm/encoding.obj: $(OUTDIR)/libvterm libvterm/src/encoding.c $(TERM_DEPS)
$(CCCTERM) /Fo$@ libvterm/src/keyboard.c
$(OUTDIR)/vterm_mouse.obj: $(OUTDIR) libvterm/src/mouse.c $(TERM_DEPS) $(OUTDIR)/libvterm/keyboard.obj: $(OUTDIR)/libvterm libvterm/src/keyboard.c $(TERM_DEPS)
$(CCCTERM) /Fo$@ libvterm/src/mouse.c
$(OUTDIR)/vterm_parser.obj: $(OUTDIR) libvterm/src/parser.c $(TERM_DEPS) $(OUTDIR)/libvterm/mouse.obj: $(OUTDIR)/libvterm libvterm/src/mouse.c $(TERM_DEPS)
$(CCCTERM) /Fo$@ libvterm/src/parser.c
$(OUTDIR)/vterm_pen.obj: $(OUTDIR) libvterm/src/pen.c $(TERM_DEPS) $(OUTDIR)/libvterm/parser.obj: $(OUTDIR)/libvterm libvterm/src/parser.c $(TERM_DEPS)
$(CCCTERM) /Fo$@ libvterm/src/pen.c
$(OUTDIR)/vterm_screen.obj: $(OUTDIR) libvterm/src/screen.c $(TERM_DEPS) $(OUTDIR)/libvterm/pen.obj: $(OUTDIR)/libvterm libvterm/src/pen.c $(TERM_DEPS)
$(CCCTERM) /Fo$@ libvterm/src/screen.c
$(OUTDIR)/vterm_state.obj: $(OUTDIR) libvterm/src/state.c $(TERM_DEPS) $(OUTDIR)/libvterm/screen.obj: $(OUTDIR)/libvterm libvterm/src/screen.c $(TERM_DEPS)
$(CCCTERM) /Fo$@ libvterm/src/state.c
$(OUTDIR)/vterm_unicode.obj: $(OUTDIR) libvterm/src/unicode.c $(TERM_DEPS) $(OUTDIR)/libvterm/state.obj: $(OUTDIR)/libvterm libvterm/src/state.c $(TERM_DEPS)
$(CCCTERM) /Fo$@ libvterm/src/unicode.c
$(OUTDIR)/vterm_vterm.obj: $(OUTDIR) libvterm/src/vterm.c $(TERM_DEPS) $(OUTDIR)/libvterm/unicode.obj: $(OUTDIR)/libvterm libvterm/src/unicode.c $(TERM_DEPS)
$(CCCTERM) /Fo$@ libvterm/src/vterm.c
$(OUTDIR)/libvterm/vterm.obj: $(OUTDIR)/libvterm libvterm/src/vterm.c $(TERM_DEPS)
# $CFLAGS may contain backslashes, quotes and chevrons, escape them all. # $CFLAGS may contain backslashes, quotes and chevrons, escape them all.

2
src/version.c
View File

@@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
519,
/**/ /**/
518, 518,
/**/ /**/