Mercurial > vim

comparison src/Make_cyg_ming.mak @ 7695:a865f9773cb2 v7.4.1146

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/a7c3795a2e65233ba2d187d680acc83bf6bf4ef5 Author: Bram Moolenaar <Bram@vim.org> Date: Wed Jan 20 22:23:15 2016 +0100 patch 7.4.1146 Problem: Can't build with Python 3 interface using MingW. Solution: Update the Makefile. (Yasuhiro Matsumoto, Ken Takata)
author Christian Brabandt <cb@256bit.org>
date Wed, 20 Jan 2016 22:30:06 +0100
parents 77a14f3bc18b
children 854302b82ff9
comparison
equal deleted inserted replaced
7694:fe56790e5c14 7695:a865f9773cb2
256 endif 256 endif
257 257
258 ifndef PYTHON3_VER 258 ifndef PYTHON3_VER
259 PYTHON3_VER=31 259 PYTHON3_VER=31
260 endif 260 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
261 267
262 ifeq (no,$(DYNAMIC_PYTHON3)) 268 ifeq (no,$(DYNAMIC_PYTHON3))
263 PYTHON3LIB=-L$(PYTHON3)/libs -lPYTHON$(PYTHON3_VER) 269 PYTHON3LIB=-L$(PYTHON3)/libs -lpython$(PYTHON3_VER)
264 endif 270 endif
265 271
272 ifndef PYTHON3INC
266 ifeq ($(CROSS),no) 273 ifeq ($(CROSS),no)
267 PYTHON3INC=-I $(PYTHON3)/include 274 PYTHON3INC=-I $(PYTHON3)/include
268 else 275 else
269 PYTHON3INC=-I $(PYTHON3)/win32inc 276 PYTHON3INC=-I $(PYTHON3)/win32inc
277 endif
270 endif 278 endif
271 endif 279 endif
272 280
273 # TCL interface: 281 # TCL interface:
274 # TCL=[Path to TCL directory] (Set inside Make_cyg.mak or Make_ming.mak) 282 # TCL=[Path to TCL directory] (Set inside Make_cyg.mak or Make_ming.mak)
480 endif 488 endif
481 489
482 ifdef PYTHON3 490 ifdef PYTHON3
483 CFLAGS += -DFEAT_PYTHON3 491 CFLAGS += -DFEAT_PYTHON3
484 ifeq (yes, $(DYNAMIC_PYTHON3)) 492 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)\"
486 endif 494 endif
487 endif 495 endif
488 496
489 ifdef TCL 497 ifdef TCL
490 CFLAGS += -DFEAT_TCL $(TCLINC) 498 CFLAGS += -DFEAT_TCL $(TCLINC)
812 820
813 $(OUTDIR)/if_python.o : if_python.c if_py_both.h $(INCL) 821 $(OUTDIR)/if_python.o : if_python.c if_py_both.h $(INCL)
814 $(CC) -c $(CFLAGS) $(PYTHONINC) $(PYTHON_HOME_DEF) $< -o $@ 822 $(CC) -c $(CFLAGS) $(PYTHONINC) $(PYTHON_HOME_DEF) $< -o $@
815 823
816 $(OUTDIR)/if_python3.o : if_python3.c if_py_both.h $(INCL) 824 $(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 $@
818 826
819 $(OUTDIR)/%.o : %.c $(INCL) 827 $(OUTDIR)/%.o : %.c $(INCL)
820 $(CC) -c $(CFLAGS) $< -o $@ 828 $(CC) -c $(CFLAGS) $< -o $@
821 829
822 $(OUTDIR)/vimrc.o: vim.rc version.h gui_w32_rc.h 830 $(OUTDIR)/vimrc.o: vim.rc version.h gui_w32_rc.h