From 64111bfca435c01cabf3714b084885957f1cb247 Mon Sep 17 00:00:00 2001 From: patthoyts Date: Sun, 22 Nov 2009 00:40:21 +0000 Subject: Include tk stubs in the tktest link line due to nijtmans recent changes --- ChangeLog | 4 ++++ win/makefile.vc | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e6af1f3..76e8e01 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2009-11-22 Pat Thoyts + + * win/Makefile.vc: Include tk stubs in the tktest link + 2009-11-21 Donal K. Fellows * generic/tkUtil.c: Remove some anachronistic techniques (pointless diff --git a/win/makefile.vc b/win/makefile.vc index 9cf8bdb..d91ee72 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -13,7 +13,7 @@ # Copyright (c) 2003-2008 Pat Thoyts. # #------------------------------------------------------------------------------ -# RCS: @(#) $Id: makefile.vc,v 1.127 2008/12/28 13:08:39 dkf Exp $ +# RCS: @(#) $Id: makefile.vc,v 1.128 2009/11/22 00:40:21 patthoyts Exp $ #------------------------------------------------------------------------------ # Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR) @@ -657,7 +657,7 @@ $(WISHC): $(WISHOBJS) $(TKIMPLIB) $(TKTEST): $(TKTESTOBJS) $(TKIMPLIB) - $(link32) $(guilflags) -stack:2300000 -out:$@ $(guilibs) $(tcllibs) $** + $(link32) $(guilflags) -stack:2300000 -out:$@ $(guilibs) $(tcllibs) $(TKSTUBLIB) $** $(_VC_MANIFEST_EMBED_EXE) -- cgit v0.12