Mercurial > vim

comparison src/Make_cyg_ming.mak @ 14696:195e8b1fcbbf v8.1.0360

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.0360: using an external diff program is slow and inflexible commit https://github.com/vim/vim/commit/e828b7621cf9065a3582be0c4dd1e0e846e335bf Author: Bram Moolenaar <Bram@vim.org> Date: Mon Sep 10 17:51:58 2018 +0200 patch 8.1.0360: using an external diff program is slow and inflexible Problem: Using an external diff program is slow and inflexible. Solution: Include the xdiff library. (Christian Brabandt, closes https://github.com/vim/vim/issues/2732) Use it by default.
author Christian Brabandt <cb@256bit.org>
date Mon, 10 Sep 2018 18:00:06 +0200
parents 78449866e9a9
children 2c72fa16aa70
comparison
equal deleted inserted replaced
14695:b178e2039b2d 14696:195e8b1fcbbf
164 else 164 else
165 # normal (Windows) compilation: 165 # normal (Windows) compilation:
166 ifndef CROSS_COMPILE 166 ifndef CROSS_COMPILE
167 CROSS_COMPILE = 167 CROSS_COMPILE =
168 endif 168 endif
169
170 # About the "sh.exe" condition, as explained by Ken Takata:
171 #
172 # If the makefile is executed with mingw32-make and sh.exe is not found in
173 # $PATH, then $SHELL is set to "sh.exe" (without any path). In this case,
174 # unix-like commands might not work and a dos-style path is needed.
175 #
176 # If the makefile is executed with mingw32-make and sh.exe IS found in $PATH,
177 # then $SHELL is set with the actual path of sh.exe (e.g.
178 # "C:/msys64/usr/bin/sh.exe"). In this case, unix-like commands can be used.
179 #
180 # If it is executed by the "make" command from cmd.exe, $SHELL is set to
181 # "/bin/sh". If the "make" command is in the $PATH, other unix-like commands
182 # might also work.
183 #
184 # If it is executed by the "make" command from a unix-like shell,
185 # $SHELL is set with the unix-style path (e.g. "/bin/bash").
186 # In this case, unix-like commands can be used.
187 #
169 ifneq (sh.exe, $(SHELL)) 188 ifneq (sh.exe, $(SHELL))
170 DEL = rm 189 DEL = rm
171 MKDIR = mkdir -p 190 MKDIR = mkdir -p
172 DIRSLASH = / 191 DIRSLASH = /
173 else 192 else
808 $(OUTDIR)/term_state.o \ 827 $(OUTDIR)/term_state.o \
809 $(OUTDIR)/term_unicode.o \ 828 $(OUTDIR)/term_unicode.o \
810 $(OUTDIR)/term_vterm.o 829 $(OUTDIR)/term_vterm.o
811 endif 830 endif
812 831
832 # Include xdiff
833 OBJ += $(OUTDIR)/xdiffi.o \
834 $(OUTDIR)/xemit.o \
835 $(OUTDIR)/xprepare.o \
836 $(OUTDIR)/xutils.o \
837 $(OUTDIR)/xhistogram.o \
838 $(OUTDIR)/xpatience.o
839
840 XDIFF_DEPS = \
841 xdiff/xdiff.h \
842 xdiff/xdiffi.h \
843 xdiff/xemit.h \
844 xdiff/xinclude.h \
845 xdiff/xmacros.h \
846 xdiff/xprepare.h \
847 xdiff/xtypes.h \
848 xdiff/xutils.h
813 849
814 ifdef MZSCHEME 850 ifdef MZSCHEME
815 MZSCHEME_SUFFIX = Z 851 MZSCHEME_SUFFIX = Z
816 endif 852 endif
817 853
1053 $(CCCTERM) libvterm/src/unicode.c -o $@ 1089 $(CCCTERM) libvterm/src/unicode.c -o $@
1054 1090
1055 $(OUTDIR)/term_vterm.o: libvterm/src/vterm.c $(TERM_DEPS) 1091 $(OUTDIR)/term_vterm.o: libvterm/src/vterm.c $(TERM_DEPS)
1056 $(CCCTERM) libvterm/src/vterm.c -o $@ 1092 $(CCCTERM) libvterm/src/vterm.c -o $@
1057 1093
1094 $(OUTDIR)/xdiffi.o: xdiff/xdiffi.c $(XDIFF_DEPS)
1095 $(CC) -c $(CFLAGS) xdiff/xdiffi.c -o $(OUTDIR)/xdiffi.o
1096
1097 $(OUTDIR)/xemit.o: xdiff/xemit.c $(XDIFF_DEPS)
1098 $(CC) -c $(CFLAGS) xdiff/xemit.c -o $(OUTDIR)/xemit.o
1099
1100 $(OUTDIR)/xprepare.o: xdiff/xprepare.c $(XDIFF_DEPS)
1101 $(CC) -c $(CFLAGS) xdiff/xprepare.c -o $(OUTDIR)/xprepare.o
1102
1103 $(OUTDIR)/xutils.o: xdiff/xutils.c $(XDIFF_DEPS)
1104 $(CC) -c $(CFLAGS) xdiff/xutils.c -o $(OUTDIR)/xutils.o
1105
1106 $(OUTDIR)/xhistogram.o: xdiff/xhistogram.c $(XDIFF_DEPS)
1107 $(CC) -c $(CFLAGS) xdiff/xhistogram.c -o $(OUTDIR)/xhistogram.o
1108
1109 $(OUTDIR)/xpatience.o: xdiff/xpatience.c $(XDIFF_DEPS)
1110 $(CC) -c $(CFLAGS) xdiff/xpatience.c -o $(OUTDIR)/xpatience.o
1058 1111
1059 pathdef.c: $(INCL) 1112 pathdef.c: $(INCL)
1060 ifneq (sh.exe, $(SHELL)) 1113 ifneq (sh.exe, $(SHELL))
1061 @echo creating pathdef.c 1114 @echo creating pathdef.c
1062 @echo '/* pathdef.c */' > pathdef.c 1115 @echo '/* pathdef.c */' > pathdef.c