From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 5 Nov 2014 12:43:21 +0000 (+0100)
Subject: updated for version 7.4.495
X-Git-Tag: v7.4.495
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=666578b53964cc34f2e9fc65c89612f063a5f3c5;p=vim

updated for version 7.4.495
Problem:    XPM isn't used correctly in the Cygwin Makefile.
Solution:   Include the rules like in Make_ming.mak. (Ken Takata)
---

diff --git a/src/Make_cyg.mak b/src/Make_cyg.mak
index abd35a6a4..ff40548df 100644
--- a/src/Make_cyg.mak
+++ b/src/Make_cyg.mak
@@ -485,13 +485,32 @@ USE_STDCPLUS = yes
 endif
 
 ##############################
+ifndef XPM
+ifeq ($(ARCH),i386)
+XPM = xpm/x86
+endif
+ifeq ($(ARCH),i486)
+XPM = xpm/x86
+endif
+ifeq ($(ARCH),i586)
+XPM = xpm/x86
+endif
+ifeq ($(ARCH),i686)
+XPM = xpm/x86
+endif
+ifeq ($(ARCH),x86-64)
+XPM = xpm/x64
+endif
+endif
+ifdef XPM
 ifneq ($(XPM),no)
 # Only allow XPM for a GUI build.
 DEFINES += -DFEAT_XPM_W32
-INCLUDES += -I$(XPM)/include
+INCLUDES += -I$(XPM)/include -I$(XPM)/../include
 EXTRA_OBJS += $(OUTDIR)/xpm_w32.o
 EXTRA_LIBS += -L$(XPM)/lib -lXpm
 endif
+endif
 
 ##############################
 EXE = gvim$(DEBUG_SUFFIX).exe
diff --git a/src/version.c b/src/version.c
index ec0e667e2..4b75a58a5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    495,
 /**/
     494,
 /**/