diff options
| author | Bram Moolenaar <Bram@vim.org> | 2011-02-15 18:06:15 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2011-02-15 18:06:15 +0100 |
| commit | c30846f525a7aace2999e83126b0847254ddaa8b (patch) | |
| tree | c4cdfeff92b455f69aae4d4e2484d70c00ff38cd /src/Make_mvc.mak | |
| parent | cab35ad26d2be6da4b3221f6f1a477312b93ea90 (diff) | |
updated for version 7.3.125v7.3.125
Problem: MSVC: Problem with quotes in link argument.
Solution: Escape backslashes and quotes. (Weasley)
Diffstat (limited to 'src/Make_mvc.mak')
| -rw-r--r-- | src/Make_mvc.mak | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak index 5b25004b16..7b56243835 100644 --- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -1159,6 +1159,10 @@ $(OUTDIR)/glbl_ime.obj: $(OUTDIR) glbl_ime.cpp dimm.h $(INCL) E0_CFLAGS = $(CFLAGS:\=\\) E_CFLAGS = $(E0_CFLAGS:"=\") # ") stop the string +# $LINKARGS2 may contain backslashes and double quotes, escape them both. +E0_LINKARGS2 = $(LINKARGS2:\=\\) +E_LINKARGS2 = $(E0_LINKARGS2:"=\") +# ") stop the string $(PATHDEF_SRC): auto @echo creating $(PATHDEF_SRC) @@ -1167,7 +1171,7 @@ $(PATHDEF_SRC): auto @echo char_u *default_vim_dir = (char_u *)"$(VIMRCLOC:\=\\)"; >> $(PATHDEF_SRC) @echo char_u *default_vimruntime_dir = (char_u *)"$(VIMRUNTIMEDIR:\=\\)"; >> $(PATHDEF_SRC) @echo char_u *all_cflags = (char_u *)"$(CC:\=\\) $(E_CFLAGS)"; >> $(PATHDEF_SRC) - @echo char_u *all_lflags = (char_u *)"$(link:\=\\) $(LINKARGS1:\=\\) $(LINKARGS2:\=\\)"; >> $(PATHDEF_SRC) + @echo char_u *all_lflags = (char_u *)"$(link:\=\\) $(LINKARGS1:\=\\) $(E_LINKARGS2)"; >> $(PATHDEF_SRC) @echo char_u *compiled_user = (char_u *)"$(USERNAME)"; >> $(PATHDEF_SRC) @echo char_u *compiled_sys = (char_u *)"$(USERDOMAIN)"; >> $(PATHDEF_SRC) |