Mercurial > vim

comparison src/Make_mvc.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 11a83cdeedf9
children 32e34e574716
comparison
equal deleted inserted replaced
9362:2e1b128a526f 9363:f9dda6450c76
653 gdi32.lib version.lib $(IME_LIB) \ 653 gdi32.lib version.lib $(IME_LIB) \
654 winspool.lib comctl32.lib advapi32.lib shell32.lib \ 654 winspool.lib comctl32.lib advapi32.lib shell32.lib \
655 /machine:$(CPU) 655 /machine:$(CPU)
656 !else 656 !else
657 SUBSYSTEM = console 657 SUBSYSTEM = console
658 CUI_INCL = iscygpty.h
659 CUI_OBJ = $(OUTDIR)\iscygpty.obj
658 !endif 660 !endif
659 661
660 !if "$(SUBSYSTEM_VER)" != "" 662 !if "$(SUBSYSTEM_VER)" != ""
661 SUBSYSTEM = $(SUBSYSTEM),$(SUBSYSTEM_VER) 663 SUBSYSTEM = $(SUBSYSTEM),$(SUBSYSTEM_VER)
662 !endif 664 !endif
1024 uninstal.exe \ 1026 uninstal.exe \
1025 xxd/xxd.exe \ 1027 xxd/xxd.exe \
1026 tee/tee.exe \ 1028 tee/tee.exe \
1027 GvimExt/gvimext.dll 1029 GvimExt/gvimext.dll
1028 1030
1029 $(VIM).exe: $(OUTDIR) $(OBJ) $(GUI_OBJ) $(OLE_OBJ) $(OLE_IDL) $(MZSCHEME_OBJ) \ 1031 $(VIM).exe: $(OUTDIR) $(OBJ) $(GUI_OBJ) $(CUI_OBJ) $(OLE_OBJ) $(OLE_IDL) $(MZSCHEME_OBJ) \
1030 $(LUA_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(PYTHON3_OBJ) $(RUBY_OBJ) $(TCL_OBJ) \ 1032 $(LUA_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(PYTHON3_OBJ) $(RUBY_OBJ) $(TCL_OBJ) \
1031 $(CSCOPE_OBJ) $(NETBEANS_OBJ) $(CHANNEL_OBJ) $(XPM_OBJ) \ 1033 $(CSCOPE_OBJ) $(NETBEANS_OBJ) $(CHANNEL_OBJ) $(XPM_OBJ) \
1032 version.c version.h 1034 version.c version.h
1033 $(CC) $(CFLAGS) version.c 1035 $(CC) $(CFLAGS) version.c
1034 $(link) $(LINKARGS1) -out:$(VIM).exe $(OBJ) $(GUI_OBJ) $(OLE_OBJ) \ 1036 $(link) $(LINKARGS1) -out:$(VIM).exe $(OBJ) $(GUI_OBJ) $(CUI_OBJ) $(OLE_OBJ) \
1035 $(LUA_OBJ) $(MZSCHEME_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(PYTHON3_OBJ) $(RUBY_OBJ) \ 1037 $(LUA_OBJ) $(MZSCHEME_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(PYTHON3_OBJ) $(RUBY_OBJ) \
1036 $(TCL_OBJ) $(CSCOPE_OBJ) $(NETBEANS_OBJ) $(CHANNEL_OBJ) \ 1038 $(TCL_OBJ) $(CSCOPE_OBJ) $(NETBEANS_OBJ) $(CHANNEL_OBJ) \
1037 $(XPM_OBJ) $(OUTDIR)\version.obj $(LINKARGS2) 1039 $(XPM_OBJ) $(OUTDIR)\version.obj $(LINKARGS2)
1038 if exist $(VIM).exe.manifest mt.exe -nologo -manifest $(VIM).exe.manifest -updateresource:$(VIM).exe;1 1040 if exist $(VIM).exe.manifest mt.exe -nologo -manifest $(VIM).exe.manifest -updateresource:$(VIM).exe;1
1039 1041
1221 $(CC) $(CFLAGS) $(RUBY_INC) if_ruby.c 1223 $(CC) $(CFLAGS) $(RUBY_INC) if_ruby.c
1222 1224
1223 $(OUTDIR)/if_tcl.obj: $(OUTDIR) if_tcl.c $(INCL) 1225 $(OUTDIR)/if_tcl.obj: $(OUTDIR) if_tcl.c $(INCL)
1224 $(CC) $(CFLAGS) $(TCL_INC) if_tcl.c 1226 $(CC) $(CFLAGS) $(TCL_INC) if_tcl.c
1225 1227
1228 $(OUTDIR)/iscygpty.obj: $(OUTDIR) iscygpty.c $(CUI_INCL)
1229 $(CC) $(CFLAGS) iscygpty.c -D_WIN32_WINNT=0x0600 -DUSE_DYNFILEID -DENABLE_STUB_IMPL
1230
1226 $(OUTDIR)/json.obj: $(OUTDIR) json.c $(INCL) 1231 $(OUTDIR)/json.obj: $(OUTDIR) json.c $(INCL)
1227 1232
1228 $(OUTDIR)/main.obj: $(OUTDIR) main.c $(INCL) 1233 $(OUTDIR)/main.obj: $(OUTDIR) main.c $(INCL) $(CUI_INCL)
1229 1234
1230 $(OUTDIR)/mark.obj: $(OUTDIR) mark.c $(INCL) 1235 $(OUTDIR)/mark.obj: $(OUTDIR) mark.c $(INCL)
1231 1236
1232 $(OUTDIR)/memfile.obj: $(OUTDIR) memfile.c $(INCL) 1237 $(OUTDIR)/memfile.obj: $(OUTDIR) memfile.c $(INCL)
1233 1238