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)

diff --git a/src/Make_cyg.mak b/src/Make_cyg.mak
index 4b9985f70abafd1bfa85495e5717fdb3bb7d8196..abd35a6a42c7dd031d5fb41109742f900efa1a02 100644 (file)
--- 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

diff --git a/src/Make_ming.mak b/src/Make_ming.mak
index 82988629eed0fdd0e5522318460a17b659e05ee0..19b4c2fe3d229f04b94da023771e1a7b701ad9ef 100644 (file)
--- 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

diff --git a/src/version.c b/src/version.c
index 78c3baa2a156c3dab9cf17026f8e2c0ca721c675..c4f560b07cd873af149579c6a3c977be36413bd4 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 */
+/**/
+    476,
 /**/
     475,
 /**/