From c3719bd87beca9f72d2e9f11e36d561c2c3b57b0 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 18 Nov 2017 22:13:31 +0100 Subject: patch 8.0.1312: balloon_show() only works in terminal when compiled with GUI Problem: balloon_show() only works in terminal when compiled with the GUI. Solution: Add FEAT_BEVAL_GUI and refactor to move common code out of the GUI specific file. --- src/Make_cyg_ming.mak | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/Make_cyg_ming.mak') diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak index 87de4e9a0..fe74a845a 100644 --- a/src/Make_cyg_ming.mak +++ b/src/Make_cyg_ming.mak @@ -642,6 +642,7 @@ GUIOBJ = $(OUTDIR)/gui.o $(OUTDIR)/gui_w32.o $(OUTDIR)/gui_beval.o $(OUTDIR)/os CUIOBJ = $(OUTDIR)/iscygpty.o OBJ = \ $(OUTDIR)/arabic.o \ + $(OUTDIR)/beval.o \ $(OUTDIR)/blowfish.o \ $(OUTDIR)/buffer.o \ $(OUTDIR)/charset.o \ @@ -920,8 +921,8 @@ endif ########################################################################### INCL = vim.h alloc.h arabic.h ascii.h ex_cmds.h farsi.h feature.h globals.h \ keymap.h macros.h option.h os_dos.h os_win32.h proto.h regexp.h \ - spell.h structs.h term.h $(NBDEBUG_INCL) -GUI_INCL = gui.h gui_beval.h + spell.h structs.h term.h beval.h $(NBDEBUG_INCL) +GUI_INCL = gui.h CUI_INCL = iscygpty.h $(OUTDIR)/if_python.o: if_python.c if_py_both.h $(INCL) @@ -946,6 +947,9 @@ $(OUTDIR)/gui_dwrite.o: gui_dwrite.cpp $(INCL) gui_dwrite.h $(OUTDIR)/gui.o: gui.c $(INCL) $(GUI_INCL) $(CC) -c $(CFLAGS) gui.c -o $(OUTDIR)/gui.o +$(OUTDIR)/beval.o: beval.c $(INCL) $(GUI_INCL) + $(CC) -c $(CFLAGS) beval.c -o $(OUTDIR)/beval.o + $(OUTDIR)/gui_beval.o: gui_beval.c $(INCL) $(GUI_INCL) $(CC) -c $(CFLAGS) gui_beval.c -o $(OUTDIR)/gui_beval.o -- cgit v1.2.1