To: vim_dev@googlegroups.com
Subject: Patch 9.0.1342
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 9.0.1342
Problem:    MS-Windows: linking may fail with space in directory name.
Solution:   Add quotes. (closes #12050)
Files:      src/Make_mvc.mak


*** ../vim-9.0.1341/src/Make_mvc.mak	2022-12-04 20:11:12.795828027 +0000
--- src/Make_mvc.mak	2023-02-23 12:34:39.811992392 +0000
***************
*** 879,885 ****
  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
  
--- 879,885 ----
  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
  
***************
*** 928,934 ****
  		-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
  
--- 928,934 ----
  		-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
  
***************
*** 953,959 ****
  PYTHON3_LIB = /nodefaultlib:python$(PYTHON3_VER).lib
  ! else
  CFLAGS = $(CFLAGS) -DPYTHON3_DLL=\"$(DYNAMIC_PYTHON3_DLL)\"
! PYTHON3_LIB = $(PYTHON3)\libs\python$(PYTHON3_VER).lib
  ! endif
  !endif
  
--- 953,959 ----
  PYTHON3_LIB = /nodefaultlib:python$(PYTHON3_VER).lib
  ! else
  CFLAGS = $(CFLAGS) -DPYTHON3_DLL=\"$(DYNAMIC_PYTHON3_DLL)\"
! PYTHON3_LIB = "$(PYTHON3)\libs\python$(PYTHON3_VER).lib"
  ! endif
  !endif
  
***************
*** 1111,1117 ****
  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
  # Do we want to load Ruby dynamically?
  ! if "$(DYNAMIC_RUBY)" == "yes"
  !  message Ruby DLL will be loaded dynamically
--- 1111,1117 ----
  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"
  # Do we want to load Ruby dynamically?
  ! if "$(DYNAMIC_RUBY)" == "yes"
  !  message Ruby DLL will be loaded dynamically
*** ../vim-9.0.1341/src/version.c	2023-02-22 13:14:33.518931022 +0000
--- src/version.c	2023-02-23 12:36:02.331935126 +0000
***************
*** 697,698 ****
--- 697,700 ----
  {   /* Add new patch number below this line */
+ /**/
+     1342,
  /**/

-- 
In Joseph Heller's novel "Catch-22", the main character tries to get out of a
war by proving he is crazy.  But the mere fact he wants to get out of the war
only shows he isn't crazy -- creating the original "Catch-22".

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///                                                                      \\\
\\\        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///