patch 8.0.0989: ActiveTcl dll name has changed in 8.6.6
Problem: ActiveTcl dll name has changed in 8.6.6.
Solution: Adjust the makefile. (Ken Takata)
diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak
index 1c368ba..52db561 100644
--- a/src/Make_cyg_ming.mak
+++ b/src/Make_cyg_ming.mak
@@ -340,6 +340,7 @@
# TCL_VER=[TCL version, eg 83, 84] (default is 86)
# TCL_VER_LONG=[Tcl version, eg 8.3] (default is 8.6)
# 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
ifndef DYNAMIC_TCL
DYNAMIC_TCL=yes
@@ -350,6 +351,9 @@
ifndef TCL_VER_LONG
TCL_VER_LONG = 8.6
endif
+ifndef TCL_DLL
+TCL_DLL = tcl$(TCL_VER).dll
+endif
TCLINC += -I$(TCL)/include
endif
@@ -526,7 +530,7 @@
ifdef TCL
CFLAGS += -DFEAT_TCL $(TCLINC)
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
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index 4180b7c..c8c1d11 100644
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@@ -84,6 +84,7 @@
# TCL_VER=[Tcl version, e.g. 80, 83] (default is 86)
# TCL_VER_LONG=[Tcl version, eg 8.3] (default is 8.6)
# 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
#
@@ -832,7 +833,9 @@
!message Tcl requested (version $(TCL_VER)) - root dir is "$(TCL)"
!if "$(DYNAMIC_TCL)" == "yes"
!message Tcl DLL will be loaded dynamically
+!ifndef TCL_DLL
TCL_DLL = tcl$(TCL_VER).dll
+!endif
CFLAGS = $(CFLAGS) -DFEAT_TCL -DDYNAMIC_TCL -DDYNAMIC_TCL_DLL=\"$(TCL_DLL)\" \
-DDYNAMIC_TCL_VER=\"$(TCL_VER_LONG)\"
TCL_OBJ = $(OUTDIR)\if_tcl.obj
diff --git a/src/version.c b/src/version.c
index 83cb3d9..9d4d431 100644
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 989,
+/**/
988,
/**/
987,