thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 9.0.1342: MS-Windows: linking may fail with space in directory name

Browse Source 
Problem:    MS-Windows: linking may fail with space in directory name.
Solution:   Add quotes. (closes #12050)
This commit is contained in:
zhihaoy
2023-02-23 12:36:22 +00:00
committed by Bram Moolenaar
parent 4ee083e7f9
commit 3e2d5385ed
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Make_mvc.mak
View File

@@ -879,7 +879,7 @@ TCL_LIB = "$(TCL)\lib\tclstub$(TCL_VER).lib"
CFLAGS = $(CFLAGS) -DFEAT_TCL CFLAGS = $(CFLAGS) -DFEAT_TCL
TCL_OBJ = $(OUTDIR)\if_tcl.obj TCL_OBJ = $(OUTDIR)\if_tcl.obj
TCL_INC = /I "$(TCL)\Include" /I "$(TCL)" 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
!endif !endif
@@ -928,7 +928,7 @@ CFLAGS = $(CFLAGS) -DDYNAMIC_PYTHON \
-DDYNAMIC_PYTHON_DLL=\"python$(PYTHON_VER).dll\" -DDYNAMIC_PYTHON_DLL=\"python$(PYTHON_VER).dll\"
PYTHON_LIB = /nodefaultlib:python$(PYTHON_VER).lib PYTHON_LIB = /nodefaultlib:python$(PYTHON_VER).lib
! else ! else
PYTHON_LIB = $(PYTHON)\libs\python$(PYTHON_VER).lib PYTHON_LIB = "$(PYTHON)\libs\python$(PYTHON_VER).lib"
! endif ! endif
!endif !endif
@@ -953,7 +953,7 @@ CFLAGS = $(CFLAGS) -DDYNAMIC_PYTHON3 \
PYTHON3_LIB = /nodefaultlib:python$(PYTHON3_VER).lib PYTHON3_LIB = /nodefaultlib:python$(PYTHON3_VER).lib
! else ! else
CFLAGS = $(CFLAGS) -DPYTHON3_DLL=\"$(DYNAMIC_PYTHON3_DLL)\" 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
!endif !endif
@@ -1111,7 +1111,7 @@ RUBY_INSTALL_NAME = x64-$(RUBY_MSVCRT_NAME)-ruby$(RUBY_API_VER)
CFLAGS = $(CFLAGS) -DFEAT_RUBY CFLAGS = $(CFLAGS) -DFEAT_RUBY
RUBY_OBJ = $(OUTDIR)\if_ruby.obj 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_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? # Do we want to load Ruby dynamically?
! if "$(DYNAMIC_RUBY)" == "yes" ! if "$(DYNAMIC_RUBY)" == "yes"
! message Ruby DLL will be loaded dynamically ! message Ruby DLL will be loaded dynamically

2
src/version.c
View File

@@ -695,6 +695,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1342,
/**/ /**/
1341, 1341,
/**/ /**/