From d1cd3efa0aa04ba0c8a2c7491bb2c6c4a5dda250 Mon Sep 17 00:00:00 2001
From: nijtmans <nijtmans>
Date: Fri, 12 Mar 2010 15:18:41 +0000
Subject: Fix [Bug 2967340]: Static build failure

---
 ChangeLog       |  5 +++++
 win/.cvsignore  |  3 +++
 win/makefile.vc | 10 +---------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e063929..ae96eb5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-12  Jan Nijtmans  <nijtmans@users.sf.net>
+
+	* win/makefile.vc         Fix [Bug 2967340]: Static build failure
+	* win/.cvsignore
+
 2010-03-10  Jan Nijtmans  <nijtmans@users.sf.net>
 
 	* generic/tclTest.c       Remove unnecessary '&' decoration for function
diff --git a/win/.cvsignore b/win/.cvsignore
index 7a35fbb..c3044c9 100644
--- a/win/.cvsignore
+++ b/win/.cvsignore
@@ -26,3 +26,6 @@ tcl.suo
 *.lib
 *.pdb
 *.ilk
+*.pch
+versions.vc
+vercl.x
diff --git a/win/makefile.vc b/win/makefile.vc
index 73fa236..511abaf 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.208 2010/03/04 22:29:05 nijtmans Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.209 2010/03/12 15:18:42 nijtmans Exp $
 #------------------------------------------------------------------------------
 
 # Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR)
@@ -620,12 +620,8 @@ $(TCLPIPEDLL): $(WINDIR)\stub16.c
 	$(_VC_MANIFEST_EMBED_DLL)
 
 !if $(STATIC_BUILD)
-!if $(TCL_USE_STATIC_PACKAGES)
-$(TCLDDELIB):
-!else
 $(TCLDDELIB): $(TMP_DIR)\tclWinDde.obj
 	$(lib32) -nologo $(LINKERFLAGS) -out:$@ $**
-!endif
 !else
 $(TCLDDELIB): $(TMP_DIR)\tclWinDde.obj $(TCLSTUBLIB)
 	$(link32) $(dlllflags) -base:@$(WINDIR)\coffbase.txt,tcldde -out:$@ \
@@ -634,12 +630,8 @@ $(TCLDDELIB): $(TMP_DIR)\tclWinDde.obj $(TCLSTUBLIB)
 !endif
 
 !if $(STATIC_BUILD)
-!if $(TCL_USE_STATIC_PACKAGES)
-$(TCLREGLIB):
-!else
 $(TCLREGLIB): $(TMP_DIR)\tclWinReg.obj
 	$(lib32) -nologo $(LINKERFLAGS) -out:$@ $**
-!endif
 !else
 $(TCLREGLIB): $(TMP_DIR)\tclWinReg.obj $(TCLSTUBLIB)
 	$(link32) $(dlllflags) -base:@$(WINDIR)\coffbase.txt,tclreg -out:$@ \
-- 
cgit v0.12