File tree Expand file tree Collapse file tree 2 files changed +13
-3
lines changed
Expand file tree Collapse file tree 2 files changed +13
-3
lines changed Original file line number Diff line number Diff line change @@ -258,17 +258,25 @@ endif
258258ifndef PYTHON3_VER
259259PYTHON3_VER =31
260260endif
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
262268ifeq (no,$(DYNAMIC_PYTHON3 ) )
263- PYTHON3LIB =-L$(PYTHON3 ) /libs -lPYTHON $(PYTHON3_VER )
269+ PYTHON3LIB =-L$(PYTHON3 ) /libs -lpython $(PYTHON3_VER )
264270endif
265271
272+ ifndef PYTHON3INC
266273ifeq ($(CROSS ) ,no)
267274PYTHON3INC =-I $(PYTHON3 ) /include
268275else
269276PYTHON3INC =-I $(PYTHON3 ) /win32inc
270277endif
271278endif
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
482490ifdef PYTHON3
483491CFLAGS += -DFEAT_PYTHON3
484492ifeq (yes, $(DYNAMIC_PYTHON3 ) )
485- CFLAGS += -DDYNAMIC_PYTHON3 -DDYNAMIC_PYTHON3_DLL=\"PYTHON $( PYTHON3_VER ) .dll \"
493+ CFLAGS += -DDYNAMIC_PYTHON3 -DDYNAMIC_PYTHON3_DLL=\"$( DYNAMIC_PYTHON3_DLL ) \"
486494endif
487495endif
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 $@
Original file line number Diff line number Diff line change @@ -741,6 +741,8 @@ static char *(features[]) =
741741
742742static int included_patches [] =
743743{ /* Add new patch number below this line */
744+ /**/
745+ 1146 ,
744746/**/
745747 1145 ,
746748/**/
You can’t perform that action at this time.
0 commit comments