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.

diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak
index 350074fae4a94a63595d300eab48a33e71da1f97..ca6f844a93401e3c2b5fd58ab27fab609b3b903d 100644 (file)
--- 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
 

diff --git a/src/version.c b/src/version.c
index b22b30c9175eec0826881132e52a72d47dfc75ea..a14e06992e2a090569851f9d3ab5492a93274501 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1063,
 /**/
     1062,
 /**/