Mercurial > vim

comparison src/Make_cyg_ming.mak @ 7456:2c5e813e8852 v7.4.1031

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/3c6f92e52ef15df4aa248ce00eacd65928044210 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Jan 2 20:26:36 2016 +0100 patch 7.4.1031 Problem: Can't build with Python interface using MingW. Solution: Update the Makefile. (Yasuhiro Matsumoto)
author Christian Brabandt <cb@256bit.org>
date Sat, 02 Jan 2016 20:30:04 +0100
parents 64ff14cbb665
children 665330ac1d78
comparison
equal deleted inserted replaced
7455:79e92f5d846c 7456:2c5e813e8852
210 ifndef DYNAMIC_PYTHON 210 ifndef DYNAMIC_PYTHON
211 DYNAMIC_PYTHON=yes 211 DYNAMIC_PYTHON=yes
212 endif 212 endif
213 213
214 ifndef PYTHON_VER 214 ifndef PYTHON_VER
215 PYTHON_VER=22 215 PYTHON_VER=27
216 endif
217 ifndef DYNAMIC_PYTHON_DLL
218 DYNAMIC_PYTHON_DLL=python$(PYTHON_VER).dll
219 endif
220 ifdef PYTHON_HOME
221 PYTHON_HOME_DEF=-DPYTHON_HOME=\"$(PYTHON_HOME)\"
216 endif 222 endif
217 223
218 ifeq (no,$(DYNAMIC_PYTHON)) 224 ifeq (no,$(DYNAMIC_PYTHON))
219 PYTHONLIB=-L$(PYTHON)/libs -lpython$(PYTHON_VER) 225 PYTHONLIB=-L$(PYTHON)/libs -lpython$(PYTHON_VER)
220 endif 226 endif
221 # my include files are in 'win32inc' on Linux, and 'include' in the standard 227 # my include files are in 'win32inc' on Linux, and 'include' in the standard
222 # NT distro (ActiveState) 228 # NT distro (ActiveState)
229 ifndef PYTHONINC
223 ifeq ($(CROSS),no) 230 ifeq ($(CROSS),no)
224 PYTHONINC=-I $(PYTHON)/include 231 PYTHONINC=-I $(PYTHON)/include
225 else 232 else
226 PYTHONINC=-I $(PYTHON)/win32inc 233 PYTHONINC=-I $(PYTHON)/win32inc
234 endif
227 endif 235 endif
228 endif 236 endif
229 237
230 # Python3 interface: 238 # Python3 interface:
231 # PYTHON3=[Path to Python3 directory] (Set inside Make_cyg.mak or Make_ming.mak) 239 # PYTHON3=[Path to Python3 directory] (Set inside Make_cyg.mak or Make_ming.mak)
770 INCL = vim.h feature.h os_win32.h os_dos.h ascii.h keymap.h term.h macros.h \ 778 INCL = vim.h feature.h os_win32.h os_dos.h ascii.h keymap.h term.h macros.h \
771 structs.h regexp.h option.h ex_cmds.h proto.h globals.h farsi.h \ 779 structs.h regexp.h option.h ex_cmds.h proto.h globals.h farsi.h \
772 gui.h 780 gui.h
773 781
774 $(OUTDIR)/if_python.o : if_python.c if_py_both.h $(INCL) 782 $(OUTDIR)/if_python.o : if_python.c if_py_both.h $(INCL)
775 $(CC) -c $(CFLAGS) $(PYTHONINC) -DDYNAMIC_PYTHON_DLL=\"python$(PYTHON_VER).dll\" $< -o $@ 783 $(CC) -c $(CFLAGS) $(PYTHONINC) $(PYTHON_HOME_DEF) -DDYNAMIC_PYTHON_DLL=\"$(DYNAMIC_PYTHON_DLL)\" $< -o $@
776 784
777 $(OUTDIR)/if_python3.o : if_python3.c if_py_both.h $(INCL) 785 $(OUTDIR)/if_python3.o : if_python3.c if_py_both.h $(INCL)
778 $(CC) -c $(CFLAGS) $(PYTHON3INC) -DDYNAMIC_PYTHON3_DLL=\"PYTHON$(PYTHON3_VER).dll\" $< -o $@ 786 $(CC) -c $(CFLAGS) $(PYTHON3INC) -DDYNAMIC_PYTHON3_DLL=\"PYTHON$(PYTHON3_VER).dll\" $< -o $@
779 787
780 $(OUTDIR)/%.o : %.c $(INCL) 788 $(OUTDIR)/%.o : %.c $(INCL)