Patch
Problem: When trying to buid vim with xpm_w32 support, the Make_mvc
runs into troubles as soon as the path names of required
libraries and include files contain spaces.
Solution: Quote such path names.
Files: src/Make_mvc.mak
*** ..\vim-7.0.000\src\Make_mvc.mak 2006-06-09 09:55:53.956646400 +0200
--- src\Make_mvc.mak 2006-06-09 10:40:59.957684800 +0200
***************
*** 262,272 ****
!ifdef XPM
# XPM - Include support for XPM signs
! # you can get xpm.lib from http://iamphet.nm.ru/xpm or create it yourself
XPM_OBJ = $(OBJDIR)/xpm_w32.obj
XPM_DEFS = -DFEAT_XPM_W32
XPM_LIB = "$(XPM)\lib\libXpm.lib"
! XPM_INC = -I $(XPM)\include
!endif
!endif
--- 262,272 ----
!ifdef XPM
# XPM - Include support for XPM signs
! # you can get xpm.lib from http://gnuwin32.sourceforge.net/packages/xpm.htm
XPM_OBJ = $(OBJDIR)/xpm_w32.obj
XPM_DEFS = -DFEAT_XPM_W32
XPM_LIB = "$(XPM)\lib\libXpm.lib"
! XPM_INC = -I "$(XPM)\include" -I "$(XPM)\include\x11"
!endif
!endif
***************
*** 962,967 ****
--- 962,974 ----
E0_CFLAGS = $(CFLAGS:\=\\)
E_CFLAGS = $(E0_CFLAGS:"=\")
+ # $LINKARGS1 and $LINKARGS2 may contain backslashes and double quotes.
+ # Excape them both.
+ E0_LINKARGS1 = $(LINKARGS1:\=\\)
+ E_LINKARGS1 = $(E0_LINKARGS1:"=\")
+ E0_LINKARGS2 = $(LINKARGS2:\=\\)
+ E_LINKARGS2 = $(E0_LINKARGS2:"=\")
+
$(PATHDEF_SRC): auto
@echo creating $@
@copy << $@
***************
*** 970,976 ****
char_u *default_vim_dir = (char_u *)"$(VIMRCLOC:\=\\)";
char_u *default_vimruntime_dir = (char_u *)"$(VIMRUNTIMEDIR:\=\\)";
char_u *all_cflags = (char_u *)"$(CC:\=\\) $(E_CFLAGS)";
! char_u *all_lflags = (char_u *)"$(link:\=\\) $(LINKARGS1:\=\\)
$(LINKARGS2:\=\\)";
char_u *compiled_user = (char_u *)"$(USERNAME)";
char_u *compiled_sys = (char_u *)"$(USERDOMAIN)";
<<
--- 977,983 ----
char_u *default_vim_dir = (char_u *)"$(VIMRCLOC:\=\\)";
char_u *default_vimruntime_dir = (char_u *)"$(VIMRUNTIMEDIR:\=\\)";
char_u *all_cflags = (char_u *)"$(CC:\=\\) $(E_CFLAGS)";
! char_u *all_lflags = (char_u *)"$(link:\=\\) $(E_LINKARGS1) $(E_LINKARGS2)";
char_u *compiled_user = (char_u *)"$(USERNAME)";
char_u *compiled_sys = (char_u *)"$(USERDOMAIN)";
<<
--
Thanks a lot for the VIM Editor!
Greetings
Mathias
