Mercurial > vim

changeset 6284:4c29b75cae19 v7.4.476

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.4.476 Problem: MingW: compiling with "XPM=no" doesn't work. Solution: Check for the "no" value. (KF Leong) Also for Cygwin. (Ken Takata)
author Bram Moolenaar <bram@vim.org>
date Wed, 15 Oct 2014 12:07:11 +0200
parents 79c59b4c9d20
children b77be7bf7cbe
files src/Make_cyg.mak src/Make_ming.mak src/version.c
diffstat 3 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/Make_cyg.mak
+++ b/src/Make_cyg.mak
@@ -485,7 +485,7 @@ USE_STDCPLUS = yes
 endif
 
 ##############################
-ifdef XPM
+ifneq ($(XPM),no)
 # Only allow XPM for a GUI build.
 DEFINES += -DFEAT_XPM_W32
 INCLUDES += -I$(XPM)/include
--- a/src/Make_ming.mak
+++ b/src/Make_ming.mak
@@ -22,7 +22,7 @@
 #     http://www.matcode.com/mpress.htm
 #
 # Maintained by Ron Aaron <ronaharon@yahoo.com> et al.
-# Updated 2012 Sep 5.
+# Updated 2014 Oct 13.
 
 #>>>>> choose options:
 # set to yes for a debug build
@@ -613,7 +613,7 @@ LIB += -ld2d1 -ldwrite
 USE_STDCPLUS = yes
 endif
 endif
-ifdef XPM
+ifneq ($(XPM),no)
 # Only allow XPM for a GUI build.
 ifeq (yes, $(GUI))
 OBJ += $(OUTDIR)/xpm_w32.o
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    476,
+/**/
     475,
 /**/
     474,