diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-06-26 20:37:46 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-06-26 20:37:46 +0200 |
| commit | 97ff9b9cffd97219d888874b9b3811d55e99c78f (patch) | |
| tree | cfd1f0b30064c64e80e3520a9ffa7854b19f36e4 /src/Make_mvc.mak | |
| parent | 52df117df724a7ad20affdf15214d2df2e507dcc (diff) | |
patch 7.4.1963v7.4.1963
Problem: Running Win32 Vim in mintty does not work.
Solution: Detect mintty and give a helpful error message. (Ken Takata)
Diffstat (limited to 'src/Make_mvc.mak')
| -rw-r--r-- | src/Make_mvc.mak | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak index f1e3f01386..5687f0999f 100644 --- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -655,6 +655,8 @@ GUI_LIB = \ /machine:$(CPU) !else SUBSYSTEM = console +CUI_INCL = iscygpty.h +CUI_OBJ = $(OUTDIR)\iscygpty.obj !endif !if "$(SUBSYSTEM_VER)" != "" @@ -1026,12 +1028,12 @@ all: $(VIM).exe \ tee/tee.exe \ GvimExt/gvimext.dll -$(VIM).exe: $(OUTDIR) $(OBJ) $(GUI_OBJ) $(OLE_OBJ) $(OLE_IDL) $(MZSCHEME_OBJ) \ +$(VIM).exe: $(OUTDIR) $(OBJ) $(GUI_OBJ) $(CUI_OBJ) $(OLE_OBJ) $(OLE_IDL) $(MZSCHEME_OBJ) \ $(LUA_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(PYTHON3_OBJ) $(RUBY_OBJ) $(TCL_OBJ) \ $(CSCOPE_OBJ) $(NETBEANS_OBJ) $(CHANNEL_OBJ) $(XPM_OBJ) \ version.c version.h $(CC) $(CFLAGS) version.c - $(link) $(LINKARGS1) -out:$(VIM).exe $(OBJ) $(GUI_OBJ) $(OLE_OBJ) \ + $(link) $(LINKARGS1) -out:$(VIM).exe $(OBJ) $(GUI_OBJ) $(CUI_OBJ) $(OLE_OBJ) \ $(LUA_OBJ) $(MZSCHEME_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(PYTHON3_OBJ) $(RUBY_OBJ) \ $(TCL_OBJ) $(CSCOPE_OBJ) $(NETBEANS_OBJ) $(CHANNEL_OBJ) \ $(XPM_OBJ) $(OUTDIR)\version.obj $(LINKARGS2) @@ -1223,9 +1225,12 @@ $(OUTDIR)/if_ruby.obj: $(OUTDIR) if_ruby.c $(INCL) $(OUTDIR)/if_tcl.obj: $(OUTDIR) if_tcl.c $(INCL) $(CC) $(CFLAGS) $(TCL_INC) if_tcl.c +$(OUTDIR)/iscygpty.obj: $(OUTDIR) iscygpty.c $(CUI_INCL) + $(CC) $(CFLAGS) iscygpty.c -D_WIN32_WINNT=0x0600 -DUSE_DYNFILEID -DENABLE_STUB_IMPL + $(OUTDIR)/json.obj: $(OUTDIR) json.c $(INCL) -$(OUTDIR)/main.obj: $(OUTDIR) main.c $(INCL) +$(OUTDIR)/main.obj: $(OUTDIR) main.c $(INCL) $(CUI_INCL) $(OUTDIR)/mark.obj: $(OUTDIR) mark.c $(INCL) |