summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-10-16 21:13:14 +0200
committerBram Moolenaar <Bram@vim.org>2018-10-16 21:13:14 +0200
commitb361db077ffb9669147d3ff1cc0191154f7289e4 (patch)
tree230791577679a84f8b0c211c9fa5623ba5641895
parent64f410742f101d7d5ea9e65503e1e0019605eaa5 (diff)
downloadvim-git-b361db077ffb9669147d3ff1cc0191154f7289e4.tar.gz
patch 8.1.0480: MinGW build file uses different -I flags than MVCv8.1.0480
Problem: MinGW build file uses different -I flags than MVC. Solution: Add -I to $CFLAGS. (Ken takata)
-rw-r--r--src/Make_cyg_ming.mak4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak
index e213b803d..3f058422b 100644
--- a/src/Make_cyg_ming.mak
+++ b/src/Make_cyg_ming.mak
@@ -501,7 +501,7 @@ endif
#>>>>> end of choices
###########################################################################
-CFLAGS = -Iproto $(DEFINES) -pipe -march=$(ARCH) -Wall
+CFLAGS = -I. -Iproto $(DEFINES) -pipe -march=$(ARCH) -Wall
CXXFLAGS = -std=gnu++11
WINDRES_FLAGS = --preprocessor="$(WINDRES_CC) -E -xc" -DRC_INVOKED
EXTRA_LIBS =
@@ -1049,7 +1049,7 @@ auto/if_perl.c: if_perl.xs typemap
$(PERLTYPEMAP) if_perl.xs -output $@
$(OUTDIR)/if_perl.o: auto/if_perl.c $(INCL)
- $(CC) -c $(CFLAGS) -I. auto/if_perl.c -o $(OUTDIR)/if_perl.o
+ $(CC) -c $(CFLAGS) auto/if_perl.c -o $(OUTDIR)/if_perl.o
$(OUTDIR)/if_ruby.o: if_ruby.c $(INCL)
diff --git a/src/version.c b/src/version.c
index 350c8a7ac..1eab778c9 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 */
/**/
+ 480,
+/**/
479,
/**/
478,