# HG changeset patch # User Bram Moolenaar # Date 1677156303 -3600 # Node ID 0b0fe53fee8dd1aaf6ddbbb4425cc23dd466eb1c # Parent c9428435dafe5018abf178d7eeee9e8deb589c2e patch 9.0.1342: MS-Windows: linking may fail with space in directory name Commit: https://github.com/vim/vim/commit/3e2d5385edcdaa4a09e76081e8d309d8f8c9a58a Author: zhihaoy <43971430+zhihaoy@users.noreply.github.com> Date: Thu Feb 23 12:36:22 2023 +0000 patch 9.0.1342: MS-Windows: linking may fail with space in directory name Problem: MS-Windows: linking may fail with space in directory name. Solution: Add quotes. (closes https://github.com/vim/vim/issues/12050) diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak --- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -879,7 +879,7 @@ TCL_LIB = "$(TCL)\lib\tclstub$(TCL_VER). 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 +TCL_LIB = "$(TCL)\lib\tcl$(TCL_VER)vc.lib" ! endif !endif @@ -928,7 +928,7 @@ CFLAGS = $(CFLAGS) -DDYNAMIC_PYTHON \ -DDYNAMIC_PYTHON_DLL=\"python$(PYTHON_VER).dll\" PYTHON_LIB = /nodefaultlib:python$(PYTHON_VER).lib ! else -PYTHON_LIB = $(PYTHON)\libs\python$(PYTHON_VER).lib +PYTHON_LIB = "$(PYTHON)\libs\python$(PYTHON_VER).lib" ! endif !endif @@ -953,7 +953,7 @@ CFLAGS = $(CFLAGS) -DDYNAMIC_PYTHON3 \ PYTHON3_LIB = /nodefaultlib:python$(PYTHON3_VER).lib ! else CFLAGS = $(CFLAGS) -DPYTHON3_DLL=\"$(DYNAMIC_PYTHON3_DLL)\" -PYTHON3_LIB = $(PYTHON3)\libs\python$(PYTHON3_VER).lib +PYTHON3_LIB = "$(PYTHON3)\libs\python$(PYTHON3_VER).lib" ! endif !endif @@ -1111,7 +1111,7 @@ RUBY_INSTALL_NAME = x64-$(RUBY_MSVCRT_NA CFLAGS = $(CFLAGS) -DFEAT_RUBY RUBY_OBJ = $(OUTDIR)\if_ruby.obj RUBY_INC = /I "$(RUBY)\include\ruby-$(RUBY_API_VER_LONG)" /I "$(RUBY)\include\ruby-$(RUBY_API_VER_LONG)\$(RUBY_PLATFORM)" -RUBY_LIB = $(RUBY)\lib\$(RUBY_INSTALL_NAME).lib +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 diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1342, +/**/ 1341, /**/ 1340,