Mercurial > vim
comparison src/Make_mvc.mak @ 17397:aa5faf7dca24 v8.1.1697
patch 8.1.1697: cannot build with MSVC
commit https://github.com/vim/vim/commit/c9afd15bc8c123e9066258e6edf2f806855d230b
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Jul 15 21:15:05 2019 +0200
patch 8.1.1697: cannot build with MSVC
Problem: Cannto build with MSVC.
Solution: Remove the backslashes after the @<< mechanism.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Mon, 15 Jul 2019 21:30:07 +0200 |
parents | 119a53a4cb0e |
children | cfdef48743ed |
comparison
equal
deleted
inserted
replaced
17396:e89f179e0a25 | 17397:aa5faf7dca24 |
---|---|
1278 $(LUA_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(PYTHON3_OBJ) $(RUBY_OBJ) $(TCL_OBJ) \ | 1278 $(LUA_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(PYTHON3_OBJ) $(RUBY_OBJ) $(TCL_OBJ) \ |
1279 $(CSCOPE_OBJ) $(TERM_OBJ) $(SOUND_OBJ) $(NETBEANS_OBJ) $(CHANNEL_OBJ) $(XPM_OBJ) \ | 1279 $(CSCOPE_OBJ) $(TERM_OBJ) $(SOUND_OBJ) $(NETBEANS_OBJ) $(CHANNEL_OBJ) $(XPM_OBJ) \ |
1280 version.c version.h | 1280 version.c version.h |
1281 $(CC) $(CFLAGS_OUTDIR) version.c | 1281 $(CC) $(CFLAGS_OUTDIR) version.c |
1282 $(link) @<< | 1282 $(link) @<< |
1283 $(LINKARGS1) /dll -out:$(VIMDLLBASE).dll $(OBJ) $(XDIFF_OBJ) $(GUI_OBJ) $(CUI_OBJ) $(OLE_OBJ) \ | 1283 $(LINKARGS1) /dll -out:$(VIMDLLBASE).dll $(OBJ) $(XDIFF_OBJ) $(GUI_OBJ) $(CUI_OBJ) $(OLE_OBJ) |
1284 $(LUA_OBJ) $(MZSCHEME_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(PYTHON3_OBJ) $(RUBY_OBJ) \ | 1284 $(LUA_OBJ) $(MZSCHEME_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(PYTHON3_OBJ) $(RUBY_OBJ) |
1285 $(TCL_OBJ) $(CSCOPE_OBJ) $(TERM_OBJ) $(SOUND_OBJ) $(NETBEANS_OBJ) $(CHANNEL_OBJ) \ | 1285 $(TCL_OBJ) $(CSCOPE_OBJ) $(TERM_OBJ) $(SOUND_OBJ) $(NETBEANS_OBJ) $(CHANNEL_OBJ) |
1286 $(XPM_OBJ) $(OUTDIR)\version.obj $(LINKARGS2) | 1286 $(XPM_OBJ) $(OUTDIR)\version.obj $(LINKARGS2) |
1287 << | 1287 << |
1288 | 1288 |
1289 $(GVIM).exe: $(OUTDIR) $(EXEOBJG) $(VIMDLLBASE).dll | 1289 $(GVIM).exe: $(OUTDIR) $(EXEOBJG) $(VIMDLLBASE).dll |
1290 $(link) $(LINKARGS1) /subsystem:$(SUBSYSTEM) -out:$(GVIM).exe $(EXEOBJG) $(VIMDLLBASE).lib $(LIBC) | 1290 $(link) $(LINKARGS1) /subsystem:$(SUBSYSTEM) -out:$(GVIM).exe $(EXEOBJG) $(VIMDLLBASE).lib $(LIBC) |
1300 $(LUA_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(PYTHON3_OBJ) $(RUBY_OBJ) $(TCL_OBJ) \ | 1300 $(LUA_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(PYTHON3_OBJ) $(RUBY_OBJ) $(TCL_OBJ) \ |
1301 $(CSCOPE_OBJ) $(TERM_OBJ) $(SOUND_OBJ) $(NETBEANS_OBJ) $(CHANNEL_OBJ) $(XPM_OBJ) \ | 1301 $(CSCOPE_OBJ) $(TERM_OBJ) $(SOUND_OBJ) $(NETBEANS_OBJ) $(CHANNEL_OBJ) $(XPM_OBJ) \ |
1302 version.c version.h | 1302 version.c version.h |
1303 $(CC) $(CFLAGS_OUTDIR) version.c | 1303 $(CC) $(CFLAGS_OUTDIR) version.c |
1304 $(link) @<< | 1304 $(link) @<< |
1305 $(LINKARGS1) /subsystem:$(SUBSYSTEM) -out:$(VIM).exe $(OBJ) $(XDIFF_OBJ) $(GUI_OBJ) $(CUI_OBJ) $(OLE_OBJ) \ | 1305 $(LINKARGS1) /subsystem:$(SUBSYSTEM) -out:$(VIM).exe $(OBJ) $(XDIFF_OBJ) $(GUI_OBJ) $(CUI_OBJ) $(OLE_OBJ) |
1306 $(LUA_OBJ) $(MZSCHEME_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(PYTHON3_OBJ) $(RUBY_OBJ) \ | 1306 $(LUA_OBJ) $(MZSCHEME_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(PYTHON3_OBJ) $(RUBY_OBJ) |
1307 $(TCL_OBJ) $(CSCOPE_OBJ) $(TERM_OBJ) $(SOUND_OBJ) $(NETBEANS_OBJ) $(CHANNEL_OBJ) \ | 1307 $(TCL_OBJ) $(CSCOPE_OBJ) $(TERM_OBJ) $(SOUND_OBJ) $(NETBEANS_OBJ) $(CHANNEL_OBJ) |
1308 $(XPM_OBJ) $(OUTDIR)\version.obj $(LINKARGS2) | 1308 $(XPM_OBJ) $(OUTDIR)\version.obj $(LINKARGS2) |
1309 << | 1309 << |
1310 if exist $(VIM).exe.manifest mt.exe -nologo -manifest $(VIM).exe.manifest -updateresource:$(VIM).exe;1 | 1310 if exist $(VIM).exe.manifest mt.exe -nologo -manifest $(VIM).exe.manifest -updateresource:$(VIM).exe;1 |
1311 | 1311 |
1312 !endif | 1312 !endif |