patch 7.4.1146

Problem:    Can't build with Python 3 interface using MingW.
Solution:   Update the Makefile. (Yasuhiro Matsumoto, Ken Takata)

diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak
index 79628a823c887683dd06b9aea140ddd865e0c339..a73d77d6a74433fba6330dba1b9224ff74ee24b3 100644 (file)
--- a/src/Make_cyg_ming.mak
+++ b/src/Make_cyg_ming.mak
@@ -258,17 +258,25 @@ endif
 ifndef PYTHON3_VER
 PYTHON3_VER=31
 endif
+ifndef DYNAMIC_PYTHON3_DLL
+DYNAMIC_PYTHON3_DLL=python$(PYTHON3_VER).dll
+endif
+ifdef PYTHON3_HOME
+PYTHON3_HOME_DEF=-DPYTHON3_HOME=\"$(PYTHON3_HOME)\"
+endif
 
 ifeq (no,$(DYNAMIC_PYTHON3))
-PYTHON3LIB=-L$(PYTHON3)/libs -lPYTHON$(PYTHON3_VER)
+PYTHON3LIB=-L$(PYTHON3)/libs -lpython$(PYTHON3_VER)
 endif
 
+ifndef PYTHON3INC
 ifeq ($(CROSS),no)
 PYTHON3INC=-I $(PYTHON3)/include
 else
 PYTHON3INC=-I $(PYTHON3)/win32inc
 endif
 endif
+endif
 
 #      TCL interface:
 #        TCL=[Path to TCL directory] (Set inside Make_cyg.mak or Make_ming.mak)
@@ -482,7 +490,7 @@ endif
 ifdef PYTHON3 
 CFLAGS += -DFEAT_PYTHON3 
 ifeq (yes, $(DYNAMIC_PYTHON3))
-CFLAGS += -DDYNAMIC_PYTHON3 -DDYNAMIC_PYTHON3_DLL=\"PYTHON$(PYTHON3_VER).dll\"
+CFLAGS += -DDYNAMIC_PYTHON3 -DDYNAMIC_PYTHON3_DLL=\"$(DYNAMIC_PYTHON3_DLL)\"
 endif
 endif
 
@@ -814,7 +822,7 @@ $(OUTDIR)/if_python.o : if_python.c if_py_both.h $(INCL)
        $(CC) -c $(CFLAGS) $(PYTHONINC) $(PYTHON_HOME_DEF) $< -o $@
 
 $(OUTDIR)/if_python3.o : if_python3.c if_py_both.h $(INCL)
-       $(CC) -c $(CFLAGS) $(PYTHON3INC) $< -o $@
+       $(CC) -c $(CFLAGS) $(PYTHON3INC) $(PYTHON3_HOME_DEF) $< -o $@
 
 $(OUTDIR)/%.o : %.c $(INCL)
        $(CC) -c $(CFLAGS) $< -o $@

diff --git a/src/version.c b/src/version.c
index 0d6dbaadc4ef41dd2d28e876ff7b507077cd151a..02f34a8b53ad25a1b8fcada528f3a10a9bb347fc 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 */
+/**/
+    1146,
 /**/
     1145,
 /**/