Patch Problem: Make_mvc.mak can't handle path names that contain spaces. Solution: Surround path names by quotes Files: src/Make_mvc.mak
*** ..\vim-7.0.000\src\Make_mvc.mak 2006-05-31 09:13:13.607288000 +0200 --- src\Make_mvc.mak 2006-05-31 10:24:17.718779200 +0200 *************** *** 265,271 **** # 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 --- 265,271 ---- # 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 *************** *** 525,536 **** -DDYNAMIC_TCL_VER=\"$(TCL_VER_LONG)\" TCL_OBJ = $(OUTDIR)\if_tcl.obj TCL_INC = /I "$(TCL)\Include" /I "$(TCL)" ! TCL_LIB = $(TCL)\lib\tclstub$(TCL_VER).lib !else CFLAGS = $(CFLAGS) -DFEAT_TCL TCL_OBJ = $(OUTDIR)\if_tcl.obj TCL_INC = /I "$(TCL)\Include" /I "$(TCL)" ! TCL_LIB = $(TCL)\lib\tcl$(TCL_VER)vc.lib !endif !endif --- 525,536 ---- -DDYNAMIC_TCL_VER=\"$(TCL_VER_LONG)\" TCL_OBJ = $(OUTDIR)\if_tcl.obj TCL_INC = /I "$(TCL)\Include" /I "$(TCL)" ! TCL_LIB = "$(TCL)\lib\tclstub$(TCL_VER).lib" !else CFLAGS = $(CFLAGS) -DFEAT_TCL TCL_OBJ = $(OUTDIR)\if_tcl.obj TCL_INC = /I "$(TCL)\Include" /I "$(TCL)" ! TCL_LIB = "$(TCL)\lib\tcl$(TCL_VER)vc.lib" !endif !endif *************** *** 551,557 **** -DDYNAMIC_PYTHON_DLL=\"python$(PYTHON_VER).dll\" PYTHON_LIB = /nodefaultlib:python$(PYTHON_VER).lib !else ! PYTHON_LIB = $(PYTHON)\libs\python$(PYTHON_VER).lib !endif !endif --- 551,557 ---- -DDYNAMIC_PYTHON_DLL=\"python$(PYTHON_VER).dll\" PYTHON_LIB = /nodefaultlib:python$(PYTHON_VER).lib !else ! PYTHON_LIB = "$(PYTHON)\libs\python$(PYTHON_VER).lib" !endif !endif *************** *** 561,575 **** !ifndef MZSCHEME_VER MZSCHEME_VER = 205_000 !endif ! CFLAGS = $(CFLAGS) -DFEAT_MZSCHEME -I $(MZSCHEME)\include !if "$(DYNAMIC_MZSCHEME)" == "yes" !message MzScheme DLLs will be loaded dynamically CFLAGS = $(CFLAGS) -DDYNAMIC_MZSCHEME \ -DDYNAMIC_MZSCH_DLL=\"libmzsch$(MZSCHEME_VER).dll\" \ -DDYNAMIC_MZGC_DLL=\"libmzgc$(MZSCHEME_VER).dll\" !else ! MZSCHEME_LIB = $(MZSCHEME)\lib\msvc\libmzgc$(MZSCHEME_VER).lib \ ! $(MZSCHEME)\lib\msvc\libmzsch$(MZSCHEME_VER).lib !endif MZSCHEME_OBJ = $(OUTDIR)\if_mzsch.obj !endif --- 561,575 ---- !ifndef MZSCHEME_VER MZSCHEME_VER = 205_000 !endif ! CFLAGS = $(CFLAGS) -DFEAT_MZSCHEME -I "$(MZSCHEME)\include" !if "$(DYNAMIC_MZSCHEME)" == "yes" !message MzScheme DLLs will be loaded dynamically CFLAGS = $(CFLAGS) -DDYNAMIC_MZSCHEME \ -DDYNAMIC_MZSCH_DLL=\"libmzsch$(MZSCHEME_VER).dll\" \ -DDYNAMIC_MZGC_DLL=\"libmzgc$(MZSCHEME_VER).dll\" !else ! MZSCHEME_LIB = "$(MZSCHEME)\lib\msvc\libmzgc$(MZSCHEME_VER).lib" \ ! "$(MZSCHEME)\lib\msvc\libmzsch$(MZSCHEME_VER).lib" !endif MZSCHEME_OBJ = $(OUTDIR)\if_mzsch.obj !endif *************** *** 591,597 **** !endif # Is Perl installed in architecture-specific directories? ! !if exist($(PERL)\Bin\MSWin32-x86) PERL_ARCH = \MSWin32-x86 !endif --- 591,597 ---- !endif # Is Perl installed in architecture-specific directories? ! !if exist("$(PERL)\Bin\MSWin32-x86") PERL_ARCH = \MSWin32-x86 !endif *************** *** 599,608 **** # Version-dependent stuff !if $(PERL_VER) == 55 ! PERL_LIB = $(PERL_INCDIR)\perl.lib !else PERL_DLL = perl$(PERL_VER).dll ! PERL_LIB = $(PERL_INCDIR)\perl$(PERL_VER).lib !endif CFLAGS = $(CFLAGS) -DFEAT_PERL --- 599,608 ---- # Version-dependent stuff !if $(PERL_VER) == 55 ! PERL_LIB = "$(PERL_INCDIR)\perl.lib" !else PERL_DLL = perl$(PERL_VER).dll ! PERL_LIB = "$(PERL_INCDIR)\perl$(PERL_VER).lib" !endif CFLAGS = $(CFLAGS) -DFEAT_PERL *************** *** 613,623 **** !undef PERL_LIB !endif ! PERL_EXE = $(PERL)\Bin$(PERL_ARCH)\perl ! PERL_INC = /I $(PERL_INCDIR) PERL_OBJ = $(OUTDIR)\if_perl.obj $(OUTDIR)\if_perlsfio.obj ! XSUBPP = $(PERL)\lib\ExtUtils\xsubpp ! XSUBPP_TYPEMAP = $(PERL)\lib\ExtUtils\typemap !endif --- 613,623 ---- !undef PERL_LIB !endif ! PERL_EXE = "$(PERL)\Bin$(PERL_ARCH)\perl" ! PERL_INC = /I "$(PERL_INCDIR)" PERL_OBJ = $(OUTDIR)\if_perl.obj $(OUTDIR)\if_perlsfio.obj ! XSUBPP = "$(PERL)\lib\ExtUtils\xsubpp" ! XSUBPP_TYPEMAP = "$(PERL)\lib\ExtUtils\typemap" !endif *************** *** 653,659 **** CFLAGS = $(CFLAGS) -DFEAT_RUBY RUBY_OBJ = $(OUTDIR)\if_ruby.obj RUBY_INC = /I "$(RUBY)\lib\ruby\$(RUBY_VER_LONG)\$(RUBY_PLATFORM)" ! RUBY_LIB = $(RUBY)\lib\$(RUBY_INSTALL_NAME).lib # Do we want to load Ruby dynamically? !if "$(DYNAMIC_RUBY)" == "yes" !message Ruby DLL will be loaded dynamically --- 653,659 ---- CFLAGS = $(CFLAGS) -DFEAT_RUBY RUBY_OBJ = $(OUTDIR)\if_ruby.obj RUBY_INC = /I "$(RUBY)\lib\ruby\$(RUBY_VER_LONG)\$(RUBY_PLATFORM)" ! RUBY_LIB = "$(RUBY)\lib\$(RUBY_INSTALL_NAME).lib" # Do we want to load Ruby dynamically? !if "$(DYNAMIC_RUBY)" == "yes" !message Ruby DLL will be loaded dynamically -- Thanks a lot for the VIM Editor! Greetings Mathias
