summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-10-17 22:45:54 +0200
committerBram Moolenaar <Bram@vim.org>2018-10-17 22:45:54 +0200
commit04c86d27fed5757ae40246d7bb3fdcd0c1959468 (patch)
tree33cc5bdff2af7d78c270321c43b7b16a708f8a2c
parent115510f0bd75d9c8641ce46f4435d7efd28ddc57 (diff)
patch 8.1.0483: MinGW does not build tee.exev8.1.0483
Problem: MinGW does not build tee.exe. Solution: Add build instructions. (Yasuhiro Matsumoto, closes #3548)
-rw-r--r--src/Make_cyg_ming.mak6
-rw-r--r--src/tee/Makefile2
-rw-r--r--src/version.c2
3 files changed, 8 insertions, 2 deletions
diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak
index f5f134bdaf..f30fe2f70c 100644
--- a/src/Make_cyg_ming.mak
+++ b/src/Make_cyg_ming.mak
@@ -943,7 +943,7 @@ ifeq (yes, $(MAP))
LFLAGS += -Wl,-Map=$(TARGET).map
endif
-all: $(TARGET) vimrun.exe xxd/xxd.exe install.exe uninstal.exe GvimExt/gvimext.dll
+all: $(TARGET) vimrun.exe xxd/xxd.exe tee/tee.exe install.exe uninstal.exe GvimExt/gvimext.dll
vimrun.exe: vimrun.c
$(CC) $(CFLAGS) -o vimrun.exe vimrun.c $(LIB)
@@ -968,6 +968,9 @@ mpress: exes
xxd/xxd.exe: xxd/xxd.c
$(MAKE) -C xxd -f Make_ming.mak CC='$(CC)'
+tee/tee.exe: tee/tee.c
+ $(MAKE) -C tee CC='$(CC)'
+
GvimExt/gvimext.dll: GvimExt/gvimext.cpp GvimExt/gvimext.rc GvimExt/gvimext.h
$(MAKE) -C GvimExt -f Make_ming.mak CROSS=$(CROSS) CROSS_COMPILE=$(CROSS_COMPILE) CXX='$(CXX)' STATIC_STDCPLUS=$(STATIC_STDCPLUS)
@@ -996,6 +999,7 @@ ifdef MZSCHEME
endif
$(MAKE) -C GvimExt -f Make_ming.mak clean
$(MAKE) -C xxd -f Make_ming.mak clean
+ $(MAKE) -C tee clean
###########################################################################
INCL = vim.h alloc.h arabic.h ascii.h ex_cmds.h farsi.h feature.h globals.h \
diff --git a/src/tee/Makefile b/src/tee/Makefile
index 951a1cc363..12c43d5100 100644
--- a/src/tee/Makefile
+++ b/src/tee/Makefile
@@ -1,4 +1,4 @@
-# A very (if not the most) simplistic Makefile for OS/2
+# A very (if not the most) simplistic Makefile for MS-Windows and OS/2
CC=gcc
CFLAGS=-O2 -fno-strength-reduce
diff --git a/src/version.c b/src/version.c
index 09334c4a26..2c7550dc13 100644
--- a/src/version.c
+++ b/src/version.c
@@ -793,6 +793,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 483,
+/**/
482,
/**/
481,