Mercurial > vim

comparison src/Make_cyg_ming.mak @ 9363:f9dda6450c76 v7.4.1963

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/97ff9b9cffd97219d888874b9b3811d55e99c78f Author: Bram Moolenaar <Bram@vim.org> Date: Sun Jun 26 20:37:46 2016 +0200 patch 7.4.1963 Problem: Running Win32 Vim in mintty does not work. Solution: Detect mintty and give a helpful error message. (Ken Takata)
author Christian Brabandt <cb@256bit.org>
date Sun, 26 Jun 2016 20:45:05 +0200
parents c096095ad9fb
children 32e34e574716
comparison
equal deleted inserted replaced
9362:2e1b128a526f 9363:f9dda6450c76
590 CFLAGS += -s 590 CFLAGS += -s
591 endif 591 endif
592 592
593 LIB = -lkernel32 -luser32 -lgdi32 -ladvapi32 -lcomdlg32 -lcomctl32 -lversion 593 LIB = -lkernel32 -luser32 -lgdi32 -ladvapi32 -lcomdlg32 -lcomctl32 -lversion
594 GUIOBJ = $(OUTDIR)/gui.o $(OUTDIR)/gui_w32.o $(OUTDIR)/gui_beval.o $(OUTDIR)/os_w32exe.o 594 GUIOBJ = $(OUTDIR)/gui.o $(OUTDIR)/gui_w32.o $(OUTDIR)/gui_beval.o $(OUTDIR)/os_w32exe.o
595 CUIOBJ = $(OUTDIR)/iscygpty.o
595 OBJ = \ 596 OBJ = \
596 $(OUTDIR)/blowfish.o \ 597 $(OUTDIR)/blowfish.o \
597 $(OUTDIR)/buffer.o \ 598 $(OUTDIR)/buffer.o \
598 $(OUTDIR)/charset.o \ 599 $(OUTDIR)/charset.o \
599 $(OUTDIR)/crypt.o \ 600 $(OUTDIR)/crypt.o \
725 DEFINES += $(DEF_GUI) 726 DEFINES += $(DEF_GUI)
726 OBJ += $(GUIOBJ) 727 OBJ += $(GUIOBJ)
727 LFLAGS += -mwindows 728 LFLAGS += -mwindows
728 OUTDIR = gobj$(DEBUG_SUFFIX)$(MZSCHEME_SUFFIX)$(ARCH) 729 OUTDIR = gobj$(DEBUG_SUFFIX)$(MZSCHEME_SUFFIX)$(ARCH)
729 else 730 else
731 OBJ += $(CUIOBJ)
730 TARGET := vim$(DEBUG_SUFFIX).exe 732 TARGET := vim$(DEBUG_SUFFIX).exe
731 OUTDIR = obj$(DEBUG_SUFFIX)$(MZSCHEME_SUFFIX)$(ARCH) 733 OUTDIR = obj$(DEBUG_SUFFIX)$(MZSCHEME_SUFFIX)$(ARCH)
732 endif 734 endif
733 735
734 ifdef GETTEXT 736 ifdef GETTEXT
840 842
841 ########################################################################### 843 ###########################################################################
842 INCL = vim.h feature.h os_win32.h os_dos.h ascii.h keymap.h term.h macros.h \ 844 INCL = vim.h feature.h os_win32.h os_dos.h ascii.h keymap.h term.h macros.h \
843 structs.h regexp.h option.h ex_cmds.h proto.h globals.h farsi.h \ 845 structs.h regexp.h option.h ex_cmds.h proto.h globals.h farsi.h \
844 gui.h 846 gui.h
847 CUI_INCL = iscygpty.h
845 848
846 $(OUTDIR)/if_python.o : if_python.c if_py_both.h $(INCL) 849 $(OUTDIR)/if_python.o : if_python.c if_py_both.h $(INCL)
847 $(CC) -c $(CFLAGS) $(PYTHONINC) $(PYTHON_HOME_DEF) $< -o $@ 850 $(CC) -c $(CFLAGS) $(PYTHONINC) $(PYTHON_HOME_DEF) $< -o $@
848 851
849 $(OUTDIR)/if_python3.o : if_python3.c if_py_both.h $(INCL) 852 $(OUTDIR)/if_python3.o : if_python3.c if_py_both.h $(INCL)
884 endif 887 endif
885 888
886 if_perl.c: if_perl.xs typemap 889 if_perl.c: if_perl.xs typemap
887 $(XSUBPP) -prototypes -typemap \ 890 $(XSUBPP) -prototypes -typemap \
888 $(PERLTYPEMAP) if_perl.xs > $@ 891 $(PERLTYPEMAP) if_perl.xs > $@
892
893 $(OUTDIR)/iscygpty.o: iscygpty.c $(CUI_INCL)
894 $(CC) -c $(CFLAGS) iscygpty.c -o $(OUTDIR)/iscygpty.o -D_WIN32_WINNT=0x0600 -DUSE_DYNFILEID -DENABLE_STUB_IMPL
895
896 $(OUTDIR)/main.o: main.c $(INCL) $(CUI_INCL)
897 $(CC) -c $(CFLAGS) main.c -o $(OUTDIR)/main.o
889 898
890 $(OUTDIR)/netbeans.o: netbeans.c $(INCL) $(NBDEBUG_INCL) $(NBDEBUG_SRC) 899 $(OUTDIR)/netbeans.o: netbeans.c $(INCL) $(NBDEBUG_INCL) $(NBDEBUG_SRC)
891 $(CC) -c $(CFLAGS) netbeans.c -o $(OUTDIR)/netbeans.o 900 $(CC) -c $(CFLAGS) netbeans.c -o $(OUTDIR)/netbeans.o
892 901
893 $(OUTDIR)/channel.o: channel.c $(INCL) 902 $(OUTDIR)/channel.o: channel.c $(INCL)