Mercurial > vim
changeset 12218:cd366d80d53e v8.0.0989
patch 8.0.0989: ActiveTcl dll name has changed in 8.6.6
commit https://github.com/vim/vim/commit/77f7474d089cbc68cb7df32cc3828a9dec80fd93
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Aug 23 22:40:41 2017 +0200
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)
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Wed, 23 Aug 2017 22:45:05 +0200 |
parents | 719492eec20b |
children | 35a2cde7dfa9 |
files | src/Make_cyg_ming.mak src/Make_mvc.mak src/version.c |
diffstat | 3 files changed, 10 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/Make_cyg_ming.mak +++ b/src/Make_cyg_ming.mak @@ -340,6 +340,7 @@ endif # 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 @@ endif 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 @@ endif 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
--- 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 @@ TCL_VER_LONG = 8.6 !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