From cb35a015bca66fd1c76097082f0498ef1d007745 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 27 Mar 2013 13:07:29 +0000
Subject: Make compiling/running Tk8.5 against 8.6 headers work on Windows as
 well. In dynamic builds, Tcl_FindExecutable should always be taken from the
 stub table, even though the 8.6 headers tell otherwise. That's why in Tcl
 8.6, the Tcl_FindExecutable() call moved from Tk_MainEx to the Tk_Main()
 macro.

---
 generic/tkMain.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/generic/tkMain.c b/generic/tkMain.c
index 5d58932..cb1fb5e 100644
--- a/generic/tkMain.c
+++ b/generic/tkMain.c
@@ -171,6 +171,12 @@ Tk_MainEx(
     tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
+#if !defined(STATIC_BUILD)
+#   undef Tcl_FindExecutable
+#   define Tcl_FindExecutable \
+	(tclStubsPtr->tcl_FindExecutable) /* 144 */
+#endif
+
     Tcl_FindExecutable(argv[0]);
     tsdPtr->interp = interp;
     Tcl_Preserve((ClientData) interp);
-- 
cgit v0.12