aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-30 04:44:14 -04:00
Code Activity

patch 8.0.0989: ActiveTcl dll name has changed in 8.6.6

Browse Source 
Problem:    ActiveTcl dll name has changed in 8.6.6.
Solution:   Adjust the makefile. (Ken Takata)
This commit is contained in:
Bram Moolenaar
2017-08-23 22:40:41 +02:00
parent 829aa64cf5
commit 77f7474d08
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Make_cyg_ming.mak
View File

@@ -340,6 +340,7 @@ endif
# TCL_VER=[TCL version, eg 83, 84] (default is 86) # TCL_VER=[TCL version, eg 83, 84] (default is 86)
# TCL_VER_LONG=[Tcl version, eg 8.3] (default is 8.6) # TCL_VER_LONG=[Tcl version, eg 8.3] (default is 8.6)
# You must set TCL_VER_LONG when you set TCL_VER. # You must set TCL_VER_LONG when you set TCL_VER.
# TCL_DLL=[TCL dll name, eg tcl86.dll] (default is tcl86.dll)
ifdef TCL ifdef TCL
ifndef DYNAMIC_TCL ifndef DYNAMIC_TCL
DYNAMIC_TCL=yes DYNAMIC_TCL=yes
@@ -350,6 +351,9 @@ endif
ifndef TCL_VER_LONG ifndef TCL_VER_LONG
TCL_VER_LONG = 8.6 TCL_VER_LONG = 8.6
endif endif
ifndef TCL_DLL
TCL_DLL = tcl$(TCL_VER).dll
endif
TCLINC += -I$(TCL)/include TCLINC += -I$(TCL)/include
endif endif
@@ -526,7 +530,7 @@ endif
ifdef TCL ifdef TCL
CFLAGS += -DFEAT_TCL $(TCLINC) CFLAGS += -DFEAT_TCL $(TCLINC)
ifeq (yes, $(DYNAMIC_TCL)) ifeq (yes, $(DYNAMIC_TCL))
CFLAGS += -DDYNAMIC_TCL -DDYNAMIC_TCL_DLL=\"tcl$(TCL_VER).dll\" -DDYNAMIC_TCL_VER=\"$(TCL_VER_LONG)\" CFLAGS += -DDYNAMIC_TCL -DDYNAMIC_TCL_DLL=\"$(TCL_DLL)\" -DDYNAMIC_TCL_VER=\"$(TCL_VER_LONG)\"
endif endif
endif endif

3
src/Make_mvc.mak
View File

@@ -84,6 +84,7 @@
# TCL_VER=[Tcl version, e.g. 80, 83] (default is 86) # TCL_VER=[Tcl version, e.g. 80, 83] (default is 86)
# TCL_VER_LONG=[Tcl version, eg 8.3] (default is 8.6) # TCL_VER_LONG=[Tcl version, eg 8.3] (default is 8.6)
# You must set TCL_VER_LONG when you set TCL_VER. # You must set TCL_VER_LONG when you set TCL_VER.
# TCL_DLL=[Tcl dll name, e.g. tcl86.dll] (default is tcl86.dll)
# #
# Cscope support: CSCOPE=yes # Cscope support: CSCOPE=yes
# #
@@ -832,7 +833,9 @@ TCL_VER_LONG = 8.6
!message Tcl requested (version $(TCL_VER)) - root dir is "$(TCL)" !message Tcl requested (version $(TCL_VER)) - root dir is "$(TCL)"
!if "$(DYNAMIC_TCL)" == "yes" !if "$(DYNAMIC_TCL)" == "yes"
!message Tcl DLL will be loaded dynamically !message Tcl DLL will be loaded dynamically
!ifndef TCL_DLL
TCL_DLL = tcl$(TCL_VER).dll TCL_DLL = tcl$(TCL_VER).dll
!endif
CFLAGS = $(CFLAGS) -DFEAT_TCL -DDYNAMIC_TCL -DDYNAMIC_TCL_DLL=\"$(TCL_DLL)\" \ CFLAGS = $(CFLAGS) -DFEAT_TCL -DDYNAMIC_TCL -DDYNAMIC_TCL_DLL=\"$(TCL_DLL)\" \
-DDYNAMIC_TCL_VER=\"$(TCL_VER_LONG)\" -DDYNAMIC_TCL_VER=\"$(TCL_VER_LONG)\"
TCL_OBJ = $(OUTDIR)\if_tcl.obj TCL_OBJ = $(OUTDIR)\if_tcl.obj

2
src/version.c
View File

@@ -769,6 +769,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 */
/**/
989,
/**/ /**/
988, 988,
/**/ /**/