Skip to content

Commit 449538c

Browse files
committed
patch 7.4.1067
Problem: Can't build with MingW and Python on MS-Windows. Solution: Move the build flags to CFLAGS.
1 parent 64496ff commit 449538c

2 files changed

Lines changed: 6 additions & 4 deletions

File tree

src/Make_cyg_ming.mak

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -453,14 +453,14 @@ endif
453453
ifdef PYTHON
454454
CFLAGS += -DFEAT_PYTHON
455455
ifeq (yes, $(DYNAMIC_PYTHON))
456-
CFLAGS += -DDYNAMIC_PYTHON
456+
CFLAGS += -DDYNAMIC_PYTHON -DDYNAMIC_PYTHON_DLL=\"$(DYNAMIC_PYTHON_DLL)\"
457457
endif
458458
endif
459459

460460
ifdef PYTHON3
461461
CFLAGS += -DFEAT_PYTHON3
462462
ifeq (yes, $(DYNAMIC_PYTHON3))
463-
CFLAGS += -DDYNAMIC_PYTHON3
463+
CFLAGS += -DDYNAMIC_PYTHON3 -DDYNAMIC_PYTHON3_DLL=\"PYTHON$(PYTHON3_VER).dll\"
464464
endif
465465
endif
466466

@@ -789,10 +789,10 @@ INCL = vim.h feature.h os_win32.h os_dos.h ascii.h keymap.h term.h macros.h \
789789
gui.h
790790

791791
$(OUTDIR)/if_python.o : if_python.c if_py_both.h $(INCL)
792-
$(CC) -c $(CFLAGS) $(PYTHONINC) $(PYTHON_HOME_DEF) -DDYNAMIC_PYTHON_DLL=\"$(DYNAMIC_PYTHON_DLL)\" $< -o $@
792+
$(CC) -c $(CFLAGS) $(PYTHONINC) $(PYTHON_HOME_DEF) $< -o $@
793793

794794
$(OUTDIR)/if_python3.o : if_python3.c if_py_both.h $(INCL)
795-
$(CC) -c $(CFLAGS) $(PYTHON3INC) -DDYNAMIC_PYTHON3_DLL=\"PYTHON$(PYTHON3_VER).dll\" $< -o $@
795+
$(CC) -c $(CFLAGS) $(PYTHON3INC) $< -o $@
796796

797797
$(OUTDIR)/%.o : %.c $(INCL)
798798
$(CC) -c $(CFLAGS) $< -o $@

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -741,6 +741,8 @@ static char *(features[]) =
741741

742742
static int included_patches[] =
743743
{ /* Add new patch number below this line */
744+
/**/
745+
1067,
744746
/**/
745747
1066,
746748
/**/

0 commit comments

Comments
 (0)