summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornijtmans <nijtmans>2009-11-23 21:26:32 (GMT)
committernijtmans <nijtmans>2009-11-23 21:26:32 (GMT)
commitc2577af29d148dccad05d2fa42683f952004ff92 (patch)
tree6661b4d750ec48bd4b9d616ac6608c49ce328300
parent82d65817f8ee6263a2d59d1f3e02a5c328d1372f (diff)
downloadtcl-c2577af29d148dccad05d2fa42683f952004ff92.zip
tcl-c2577af29d148dccad05d2fa42683f952004ff92.tar.gz
tcl-c2577af29d148dccad05d2fa42683f952004ff92.tar.bz2
makefile.vc: Add stub library to necessary link lines
-rw-r--r--ChangeLog1
-rw-r--r--win/makefile.vc6
2 files changed, 4 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 42545fd..e86135d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,7 @@
* win/Makefile.in Simplifications related to tcl.m4 changes.
* win/configure.in between static libraries and import library on windows.
* win/configure (regenerated)
+ * win/makefile.vc Add stub library to necessary link lines
2009-11-23 Kevin B. Kenny <kennykb@acm.org>
diff --git a/win/makefile.vc b/win/makefile.vc
index 3bcbbd1..a4e21e2 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.202 2009/11/02 00:04:48 mistachkin Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.203 2009/11/23 21:26:32 nijtmans Exp $
#------------------------------------------------------------------------------
# Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR)
@@ -603,11 +603,11 @@ $**
$(TCLSTUBLIB): $(TCLSTUBOBJS)
$(lib32) -nologo $(LINKERFLAGS) -out:$@ $(TCLSTUBOBJS)
-$(TCLSH): $(TCLSHOBJS) $(TCLIMPLIB)
+$(TCLSH): $(TCLSHOBJS) $(TCLSTUBLIB) $(TCLIMPLIB)
$(link32) $(conlflags) -stack:2300000 -out:$@ $(baselibs) $**
$(_VC_MANIFEST_EMBED_EXE)
-$(TCLTEST): $(TCLTESTOBJS) $(TCLIMPLIB)
+$(TCLTEST): $(TCLTESTOBJS) $(TCLSTUBLIB) $(TCLIMPLIB)
$(link32) $(conlflags) -stack:2300000 -out:$@ $(baselibs) $**
$(_VC_MANIFEST_EMBED_EXE)