diff options
| author | nijtmans <nijtmans> | 2009-12-12 00:02:35 (GMT) |
|---|---|---|
| committer | nijtmans <nijtmans> | 2009-12-12 00:02:35 (GMT) |
| commit | 8feb7a6e081d55a9d7abfa75027bfbacebe664f0 (patch) | |
| tree | e02c2233116cd37fdfe2ad9499f8a9ad65190394 | |
| parent | df2b02bddc727ff4f4e1f442ae902977376d7ea3 (diff) | |
| download | tk-8feb7a6e081d55a9d7abfa75027bfbacebe664f0.zip tk-8feb7a6e081d55a9d7abfa75027bfbacebe664f0.tar.gz tk-8feb7a6e081d55a9d7abfa75027bfbacebe664f0.tar.bz2 | |
Fix dependancies on ${TKSTUBLIB} when
TCL_USE_STATIC_PACKAGES is defined
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | win/makefile.vc | 10 |
2 files changed, 10 insertions, 5 deletions
@@ -1,3 +1,8 @@ +2009-12-11 Jan Nijtmans <nijtmans@users.sf.net> + + * win/makefile.vc: Fix dependancies on ${TKSTUBLIB} when + TCL_USE_STATIC_PACKAGES is defined + 2009-12-11 Donal K. Fellows <dkf@users.sf.net> * library/tk.tcl (::tk::ScreenChanged): [Bug 2912473]: Stop problems diff --git a/win/makefile.vc b/win/makefile.vc index d91ee72..4edfeb3 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.128 2009/11/22 00:40:21 patthoyts Exp $ +# RCS: @(#) $Id: makefile.vc,v 1.129 2009/12/12 00:02:36 nijtmans Exp $ #------------------------------------------------------------------------------ # Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR) @@ -646,18 +646,18 @@ $(TKSTUBLIB): $(TKSTUBOBJS) $(lib32) -nologo -out:$@ $** -$(WISH): $(WISHOBJS) $(TKIMPLIB) +$(WISH): $(WISHOBJS) $(TKSTUBLIB) $(TKIMPLIB) $(link32) $(guilflags) -stack:2300000 -out:$@ $(guilibs) $(tcllibs) $** $(_VC_MANIFEST_EMBED_EXE) -$(WISHC): $(WISHOBJS) $(TKIMPLIB) +$(WISHC): $(WISHOBJS) $(TKSTUBLIB) $(TKIMPLIB) $(link32) $(conlflags) -stack:2300000 -out:$@ $(guilibs) $(tcllibs) $** $(_VC_MANIFEST_EMBED_EXE) -$(TKTEST): $(TKTESTOBJS) $(TKIMPLIB) - $(link32) $(guilflags) -stack:2300000 -out:$@ $(guilibs) $(tcllibs) $(TKSTUBLIB) $** +$(TKTEST): $(TKTESTOBJS) $(TKSTUBLIB) $(TKIMPLIB) + $(link32) $(guilflags) -stack:2300000 -out:$@ $(guilibs) $(tcllibs) $** $(_VC_MANIFEST_EMBED_EXE) |