diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-01-09 17:49:15 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-01-09 17:49:15 +0100 |
| commit | 449538c3d2f7089dcaa1a888f09f41714faec9a6 (patch) | |
| tree | 837060d9b87d569b21718e8f03ee0b364606442d /src | |
| parent | 64496ffc9cfb0eb6f2074f22809de2b420b5f300 (diff) | |
| download | vim-449538c3d2f7089dcaa1a888f09f41714faec9a6.zip | |
patch 7.4.1067
Problem: Can't build with MingW and Python on MS-Windows.
Solution: Move the build flags to CFLAGS.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Make_cyg_ming.mak | 8 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak index ca6f844a9..d89ba2959 100644 --- a/src/Make_cyg_ming.mak +++ b/src/Make_cyg_ming.mak @@ -453,14 +453,14 @@ endif ifdef PYTHON CFLAGS += -DFEAT_PYTHON ifeq (yes, $(DYNAMIC_PYTHON)) -CFLAGS += -DDYNAMIC_PYTHON +CFLAGS += -DDYNAMIC_PYTHON -DDYNAMIC_PYTHON_DLL=\"$(DYNAMIC_PYTHON_DLL)\" endif endif ifdef PYTHON3 CFLAGS += -DFEAT_PYTHON3 ifeq (yes, $(DYNAMIC_PYTHON3)) -CFLAGS += -DDYNAMIC_PYTHON3 +CFLAGS += -DDYNAMIC_PYTHON3 -DDYNAMIC_PYTHON3_DLL=\"PYTHON$(PYTHON3_VER).dll\" endif endif @@ -789,10 +789,10 @@ INCL = vim.h feature.h os_win32.h os_dos.h ascii.h keymap.h term.h macros.h \ gui.h $(OUTDIR)/if_python.o : if_python.c if_py_both.h $(INCL) - $(CC) -c $(CFLAGS) $(PYTHONINC) $(PYTHON_HOME_DEF) -DDYNAMIC_PYTHON_DLL=\"$(DYNAMIC_PYTHON_DLL)\" $< -o $@ + $(CC) -c $(CFLAGS) $(PYTHONINC) $(PYTHON_HOME_DEF) $< -o $@ $(OUTDIR)/if_python3.o : if_python3.c if_py_both.h $(INCL) - $(CC) -c $(CFLAGS) $(PYTHON3INC) -DDYNAMIC_PYTHON3_DLL=\"PYTHON$(PYTHON3_VER).dll\" $< -o $@ + $(CC) -c $(CFLAGS) $(PYTHON3INC) $< -o $@ $(OUTDIR)/%.o : %.c $(INCL) $(CC) -c $(CFLAGS) $< -o $@ diff --git a/src/version.c b/src/version.c index 3cddb0e31..68972921f 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1067, +/**/ 1066, /**/ 1065, |