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 abd35a6a42c7dd031d5fb41109742f900efa1a02..ff40548df9fb425a49dff25b5f73cdeb2eaa558e 100644 (file)
--- 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 ec0e667e2fe1c87aa262bb09706e24852ccdfe20..4b75a58a519c62d82d2e45d1d266adeb18b74104 100644 (file)
--- 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,
 /**/