Skip to content

Commit a7c3795

Browse files
committed
patch 7.4.1146
Problem: Can't build with Python 3 interface using MingW. Solution: Update the Makefile. (Yasuhiro Matsumoto, Ken Takata)
1 parent 23c4f71 commit a7c3795

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

src/Make_cyg_ming.mak

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -258,17 +258,25 @@ endif
258258
ifndef PYTHON3_VER
259259
PYTHON3_VER=31
260260
endif
261+
ifndef DYNAMIC_PYTHON3_DLL
262+
DYNAMIC_PYTHON3_DLL=python$(PYTHON3_VER).dll
263+
endif
264+
ifdef PYTHON3_HOME
265+
PYTHON3_HOME_DEF=-DPYTHON3_HOME=\"$(PYTHON3_HOME)\"
266+
endif
261267

262268
ifeq (no,$(DYNAMIC_PYTHON3))
263-
PYTHON3LIB=-L$(PYTHON3)/libs -lPYTHON$(PYTHON3_VER)
269+
PYTHON3LIB=-L$(PYTHON3)/libs -lpython$(PYTHON3_VER)
264270
endif
265271

272+
ifndef PYTHON3INC
266273
ifeq ($(CROSS),no)
267274
PYTHON3INC=-I $(PYTHON3)/include
268275
else
269276
PYTHON3INC=-I $(PYTHON3)/win32inc
270277
endif
271278
endif
279+
endif
272280

273281
# TCL interface:
274282
# TCL=[Path to TCL directory] (Set inside Make_cyg.mak or Make_ming.mak)
@@ -482,7 +490,7 @@ endif
482490
ifdef PYTHON3
483491
CFLAGS += -DFEAT_PYTHON3
484492
ifeq (yes, $(DYNAMIC_PYTHON3))
485-
CFLAGS += -DDYNAMIC_PYTHON3 -DDYNAMIC_PYTHON3_DLL=\"PYTHON$(PYTHON3_VER).dll\"
493+
CFLAGS += -DDYNAMIC_PYTHON3 -DDYNAMIC_PYTHON3_DLL=\"$(DYNAMIC_PYTHON3_DLL)\"
486494
endif
487495
endif
488496

@@ -814,7 +822,7 @@ $(OUTDIR)/if_python.o : if_python.c if_py_both.h $(INCL)
814822
$(CC) -c $(CFLAGS) $(PYTHONINC) $(PYTHON_HOME_DEF) $< -o $@
815823

816824
$(OUTDIR)/if_python3.o : if_python3.c if_py_both.h $(INCL)
817-
$(CC) -c $(CFLAGS) $(PYTHON3INC) $< -o $@
825+
$(CC) -c $(CFLAGS) $(PYTHON3INC) $(PYTHON3_HOME_DEF) $< -o $@
818826

819827
$(OUTDIR)/%.o : %.c $(INCL)
820828
$(CC) -c $(CFLAGS) $< -o $@

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -741,6 +741,8 @@ static char *(features[]) =
741741

742742
static int included_patches[] =
743743
{ /* Add new patch number below this line */
744+
/**/
745+
1146,
744746
/**/
745747
1145,
746748
/**/

0 commit comments

Comments
 (0)