patch 9.2.0220: MS-Windows: some defined cannot be set on Cygwin/Mingw

Problem:  In Cygwin and MinGW, options like MODIFIED_BY cannot be set.
          MSVC (Make_mvc.mak) allows you to build optional features
          without modifying the source code by specifying DEFINES in the
          nmake options. However, this is not the case in
          Make_cyg_ming.mak.
Solution: Since DEFINES is used in many places, we will provide
          EXTRA_DEFINES assuming that the user will define it. By adding
          this to DEFINES, it will be possible to specify it in the same
          way as in MSVC.

closes: #19786

Signed-off-by: Muraoka Taro <koron.kaoriya@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak
index 9ec5ef8e0881101fe502d8a164b883e0fb4b4188..0cb83ac484fe9330e29bb9a27a5672fec7404113 100644 (file)
--- a/src/Make_cyg_ming.mak
+++ b/src/Make_cyg_ming.mak
@@ -25,7 +25,14 @@
 #     http://www.matcode.com/mpress.htm
 #
 # Maintained by Ron Aaron <ronaharon@yahoo.com> et al.
-# Last Update: 2025 May 14.
+# Last Update: 2026 Mar 22.
+
+# If you want to build some optional features without modifying the source, you
+# can set EXTRA_DEFINES on the command line. Here's an example of setting
+# MODIFIED_BY:
+#
+#      mingw-make -f Make_ming.mvc \
+#        'EXTRA_DEFINES=-DMODIFIED_BY=\"yourmail@example.com\"'
 
 #>>>>> choose options:
 # FEATURES=[TINY | NORMAL | HUGE]
@@ -536,7 +543,8 @@ endif # RUBY
 # Any other defines can be included here.
 DEF_GUI=-DFEAT_GUI_MSWIN -DFEAT_CLIPBOARD
 DEFINES=-DWIN32 -DWINVER=$(WINVER) -D_WIN32_WINNT=$(WINVER) \
-       -DHAVE_PATHDEF -DFEAT_$(FEATURES) -DHAVE_STDINT_H
+       -DHAVE_PATHDEF -DFEAT_$(FEATURES) -DHAVE_STDINT_H \
+       $(EXTRA_DEFINES)
 
 #>>>>> end of choices
 ###########################################################################

diff --git a/src/version.c b/src/version.c
index 3b956fd2d8949a48355e38e7e82a19c53b5b95a2..f314e46b12c23eaa72cd7cfb3c72d7b649a397b2 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    220,
 /**/
     219,
 /**/