changeset 7523:55cd9a99514d v7.4.1063

commit https://github.com/vim/vim/commit/eca99bd45f094b1b12e22b9d6b206bd05dc9a38c Author: Bram Moolenaar <Bram@vim.org> Date: Thu Jan 7 22:50:05 2016 +0100 patch 7.4.1063 Problem: TCL_VER_LONG and DYNAMIC_TCL_VER are not set when building with Cygwin and MingW. Solution: Add TCL_VER_LONG and DYNAMIC_TCL_VER to the makefile.
author Christian Brabandt <cb@256bit.org>
date Thu, 07 Jan 2016 23:00:08 +0100
parents 1905305349c9
children 02d60f6a6874
files src/Make_cyg_ming.mak src/version.c
diffstat 2 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/Make_cyg_ming.mak
+++ b/src/Make_cyg_ming.mak
@@ -263,6 +263,8 @@ endif
 #	  TCL=[Path to TCL directory] (Set inside Make_cyg.mak or Make_ming.mak)
 #	  DYNAMIC_TCL=yes (to load the TCL DLL dynamically)
 #	  TCL_VER=[TCL version, eg 83, 84] (default is 83)
+#	  TCL_VER_LONG=[Tcl version, eg 8.3] (default is 8.3)
+#	    You must set TCL_VER_LONG when you set TCL_VER.
 ifdef TCL
 ifndef DYNAMIC_TCL
 DYNAMIC_TCL=yes
@@ -270,6 +272,9 @@ endif
 ifndef TCL_VER
 TCL_VER = 83
 endif
+ifndef TCL_VER_LONG
+TCL_VER_LONG = 8.3
+endif
 TCLINC += -I$(TCL)/include
 endif
 
@@ -462,7 +467,7 @@ endif
 ifdef TCL
 CFLAGS += -DFEAT_TCL $(TCLINC)
 ifeq (yes, $(DYNAMIC_TCL))
-CFLAGS += -DDYNAMIC_TCL -DDYNAMIC_TCL_DLL=\"tcl$(TCL_VER).dll\"
+CFLAGS += -DDYNAMIC_TCL -DDYNAMIC_TCL_DLL=\"tcl$(TCL_VER).dll\" -DDYNAMIC_TCL_VER=\"$(TCL_VER_LONG)\"
 endif
 endif
 
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1063,
+/**/
     1062,
 /**/
     1061,