aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 7.4.1146

Browse Source 
Problem:    Can't build with Python 3 interface using MingW.
Solution:   Update the Makefile. (Yasuhiro Matsumoto, Ken Takata)
This commit is contained in:
Bram Moolenaar 2016-01-20 22:23:15 +01:00
parent 23c4f7183c
commit a7c3795a2e
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Make_cyg_ming.mak
View File

@ -258,17 +258,25 @@ endif
ifndef PYTHON3_VER ifndef PYTHON3_VER
PYTHON3_VER=31 PYTHON3_VER=31
endif endif
ifndef DYNAMIC_PYTHON3_DLL
ifeq (no,$(DYNAMIC_PYTHON3)) DYNAMIC_PYTHON3_DLL=python$(PYTHON3_VER).dll
PYTHON3LIB=-L$(PYTHON3)/libs -lPYTHON$(PYTHON3_VER) endif
ifdef PYTHON3_HOME
PYTHON3_HOME_DEF=-DPYTHON3_HOME=\"$(PYTHON3_HOME)\"
endif endif
ifeq (no,$(DYNAMIC_PYTHON3))
PYTHON3LIB=-L$(PYTHON3)/libs -lpython$(PYTHON3_VER)
endif
ifndef PYTHON3INC
ifeq ($(CROSS),no) ifeq ($(CROSS),no)
PYTHON3INC=-I $(PYTHON3)/include PYTHON3INC=-I $(PYTHON3)/include
else else
PYTHON3INC=-I $(PYTHON3)/win32inc PYTHON3INC=-I $(PYTHON3)/win32inc
endif endif
endif endif
endif
# TCL interface: # TCL interface:
# TCL=[Path to TCL directory] (Set inside Make_cyg.mak or Make_ming.mak) # TCL=[Path to TCL directory] (Set inside Make_cyg.mak or Make_ming.mak)
@ -482,7 +490,7 @@ endif
ifdef PYTHON3 ifdef PYTHON3
CFLAGS += -DFEAT_PYTHON3 CFLAGS += -DFEAT_PYTHON3
ifeq (yes, $(DYNAMIC_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
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 $@ $(CC) -c $(CFLAGS) $(PYTHONINC) $(PYTHON_HOME_DEF) $< -o $@
$(OUTDIR)/if_python3.o : if_python3.c if_py_both.h $(INCL) $(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) $(OUTDIR)/%.o : %.c $(INCL)
$(CC) -c $(CFLAGS) $< -o $@ $(CC) -c $(CFLAGS) $< -o $@

2
src/version.c
View File

@ -741,6 +741,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1146,
/**/ /**/
1145, 1145,
/**/ /**/