Skip to content

Commit 77f7474

Browse files
committed
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)
1 parent 829aa64 commit 77f7474

3 files changed

Lines changed: 10 additions & 1 deletion

File tree

src/Make_cyg_ming.mak

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,6 +340,7 @@ endif
340340
# TCL_VER=[TCL version, eg 83, 84] (default is 86)
341341
# TCL_VER_LONG=[Tcl version, eg 8.3] (default is 8.6)
342342
# You must set TCL_VER_LONG when you set TCL_VER.
343+
# TCL_DLL=[TCL dll name, eg tcl86.dll] (default is tcl86.dll)
343344
ifdef TCL
344345
ifndef DYNAMIC_TCL
345346
DYNAMIC_TCL=yes
@@ -350,6 +351,9 @@ endif
350351
ifndef TCL_VER_LONG
351352
TCL_VER_LONG = 8.6
352353
endif
354+
ifndef TCL_DLL
355+
TCL_DLL = tcl$(TCL_VER).dll
356+
endif
353357
TCLINC += -I$(TCL)/include
354358
endif
355359

@@ -526,7 +530,7 @@ endif
526530
ifdef TCL
527531
CFLAGS += -DFEAT_TCL $(TCLINC)
528532
ifeq (yes, $(DYNAMIC_TCL))
529-
CFLAGS += -DDYNAMIC_TCL -DDYNAMIC_TCL_DLL=\"tcl$(TCL_VER).dll\" -DDYNAMIC_TCL_VER=\"$(TCL_VER_LONG)\"
533+
CFLAGS += -DDYNAMIC_TCL -DDYNAMIC_TCL_DLL=\"$(TCL_DLL)\" -DDYNAMIC_TCL_VER=\"$(TCL_VER_LONG)\"
530534
endif
531535
endif
532536

src/Make_mvc.mak

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@
8484
# TCL_VER=[Tcl version, e.g. 80, 83] (default is 86)
8585
# TCL_VER_LONG=[Tcl version, eg 8.3] (default is 8.6)
8686
# You must set TCL_VER_LONG when you set TCL_VER.
87+
# TCL_DLL=[Tcl dll name, e.g. tcl86.dll] (default is tcl86.dll)
8788
#
8889
# Cscope support: CSCOPE=yes
8990
#
@@ -832,7 +833,9 @@ TCL_VER_LONG = 8.6
832833
!message Tcl requested (version $(TCL_VER)) - root dir is "$(TCL)"
833834
!if "$(DYNAMIC_TCL)" == "yes"
834835
!message Tcl DLL will be loaded dynamically
836+
!ifndef TCL_DLL
835837
TCL_DLL = tcl$(TCL_VER).dll
838+
!endif
836839
CFLAGS = $(CFLAGS) -DFEAT_TCL -DDYNAMIC_TCL -DDYNAMIC_TCL_DLL=\"$(TCL_DLL)\" \
837840
-DDYNAMIC_TCL_VER=\"$(TCL_VER_LONG)\"
838841
TCL_OBJ = $(OUTDIR)\if_tcl.obj

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -769,6 +769,8 @@ static char *(features[]) =
769769

770770
static int included_patches[] =
771771
{ /* Add new patch number below this line */
772+
/**/
773+
989,
772774
/**/
773775
988,
774776
/**/

0 commit comments

Comments
 (0)