From 7d78c85b0ab356a56a3dda397a77a6b810d6981e Mon Sep 17 00:00:00 2001
From: nijtmans <nijtmans>
Date: Fri, 12 Mar 2010 15:23:39 +0000
Subject: Fix [Tcl Bug 2967340]: Static build failure

---
 ChangeLog       |  6 ++++++
 win/.cvsignore  |  3 +++
 win/makefile.vc |  3 ++-
 win/rules.vc    | 10 +++++-----
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a5880ae..46427af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-03-12  Jan Nijtmans  <nijtmans@users.sf.net>
+
+	* win/rules.vc        Fix [Tcl Bug 2967340]: Static build failure
+	* win/makefile.vc 
+	* win/.cvsignore
+
 2010-03-12  Donal K. Fellows  <dkf@users.sf.net>
 
 	* library/iconlist.tcl:		Factor out some of the machinery for
diff --git a/win/.cvsignore b/win/.cvsignore
index 702b882..a4a86d1 100644
--- a/win/.cvsignore
+++ b/win/.cvsignore
@@ -23,3 +23,6 @@ config.status
 *.manifest
 .#*
 *.a
+*.pch
+vercl.x
+versions.vc
diff --git a/win/makefile.vc b/win/makefile.vc
index 4edfeb3..82bbaf8 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.129 2009/12/12 00:02:36 nijtmans Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.130 2010/03/12 15:23:39 nijtmans Exp $
 #------------------------------------------------------------------------------
 
 # Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR)
@@ -238,6 +238,7 @@ WISHOBJS = \
 !if $(TCL_USE_STATIC_PACKAGES)
 	$(TCLDDELIB) \
 	$(TCLREGLIB) \
+	$(TCLSTUBLIB) \
 !endif
 	$(TMP_DIR)\wish.res
 
diff --git a/win/rules.vc b/win/rules.vc
index d03976e..5478215 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -11,7 +11,7 @@
 # Copyright (c) 2003-2007 Patrick Thoyts
 #
 #------------------------------------------------------------------------------
-# RCS: @(#) $Id: rules.vc,v 1.24 2008/12/31 23:11:48 davygrvy Exp $
+# RCS: @(#) $Id: rules.vc,v 1.25 2010/03/12 15:23:39 nijtmans Exp $
 #------------------------------------------------------------------------------
 
 !ifndef _RULES_VC
@@ -559,8 +559,8 @@ TCLSH           = "$(_TCLDIR)\bin\tclsh$(TCL_VERSION)t$(SUFX).exe"
 TCLSTUBLIB	= "$(_TCLDIR)\lib\tclstub$(TCL_VERSION).lib"
 TCLIMPLIB	= "$(_TCLDIR)\lib\tcl$(TCL_VERSION)$(SUFX).lib"
 TCL_LIBRARY	= $(_TCLDIR)\lib
-TCLREGLIB	= "$(_TCLDIR)\lib\tclreg11$(SUFX:t=).lib"
-TCLDDELIB	= "$(_TCLDIR)\lib\tcldde12$(SUFX:t=).lib"
+TCLREGLIB	= "$(_TCLDIR)\lib\tclreg12$(SUFX:t=).lib"
+TCLDDELIB	= "$(_TCLDIR)\lib\tcldde13$(SUFX:t=).lib"
 COFFBASE	= \must\have\tcl\sources\to\build\this\target
 TCLTOOLSDIR	= \must\have\tcl\sources\to\build\this\target
 TCL_INCLUDES    = -I"$(_TCLDIR)\include"
@@ -572,8 +572,8 @@ TCLSH		= "$(_TCLDIR)\win\$(BUILDDIRTOP)\tclsh$(TCL_VERSION)t$(SUFX).exe"
 TCLSTUBLIB	= "$(_TCLDIR)\win\$(BUILDDIRTOP)\tclstub$(TCL_VERSION).lib"
 TCLIMPLIB	= "$(_TCLDIR)\win\$(BUILDDIRTOP)\tcl$(TCL_VERSION)$(SUFX).lib"
 TCL_LIBRARY	= $(_TCLDIR)\library
-TCLREGLIB	= "$(_TCLDIR)\win\$(BUILDDIRTOP)\tclreg11$(SUFX:t=).lib"
-TCLDDELIB	= "$(_TCLDIR)\win\$(BUILDDIRTOP)\tcldde12$(SUFX:t=).lib"
+TCLREGLIB	= "$(_TCLDIR)\win\$(BUILDDIRTOP)\tclreg12$(SUFX:t=).lib"
+TCLDDELIB	= "$(_TCLDIR)\win\$(BUILDDIRTOP)\tcldde13$(SUFX:t=).lib"
 COFFBASE	= "$(_TCLDIR)\win\coffbase.txt"
 TCLTOOLSDIR	= $(_TCLDIR)\tools
 TCL_INCLUDES	= -I"$(_TCLDIR)\generic" -I"$(_TCLDIR)\win"
-- 
cgit v0.12