diff options
| author | nijtmans <nijtmans> | 2010-07-01 21:31:26 (GMT) |
|---|---|---|
| committer | nijtmans <nijtmans> | 2010-07-01 21:31:26 (GMT) |
| commit | 45811fdae2cfe4dc1ab4fe113f35c303ee31386c (patch) | |
| tree | 1ce621505cd84c6aef3c1cc52ddc7fcef960e703 | |
| parent | eaa472eda7c92abd87df99c5208082825dbd146d (diff) | |
| download | tk-45811fdae2cfe4dc1ab4fe113f35c303ee31386c.zip tk-45811fdae2cfe4dc1ab4fe113f35c303ee31386c.tar.gz tk-45811fdae2cfe4dc1ab4fe113f35c303ee31386c.tar.bz2 | |
[Bug #3020677] wish can't link reg1.2
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | win/rules.vc | 8 |
2 files changed, 9 insertions, 5 deletions
@@ -1,3 +1,7 @@ +2010-07-01 Jan Nijtmans <nijtmans@users.sf.net> + + * win/rules.vc [Bugs #3020677] wish can't link reg1.2 + 2010-06-22 Anton Kovalenko <a_kovalenko@users.sf.net> * generic/tkPlace.c: [Patch #3019624] modify "place" command, @@ -84,7 +88,7 @@ * tests/wm.test: Fix 3 tests on Ubuntu 10.4, two of them timing dependent, one wm-dependent. - * generic/tkText.c: Fix some gcc strict-aliasing warnings, + * generic/tkText.c: Fix some gcc strict-aliasing warnings, * unix/tkUnixFont.c: discovered with "-Wstrict-aliasing=2" * unix/tkUnixSelect.c: diff --git a/win/rules.vc b/win/rules.vc index 5478215..c9ee97a 100644 --- a/win/rules.vc +++ b/win/rules.vc @@ -6,12 +6,12 @@ # # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. -# +# # Copyright (c) 2001-2003 David Gravereaux. # Copyright (c) 2003-2007 Patrick Thoyts # #------------------------------------------------------------------------------ -# RCS: @(#) $Id: rules.vc,v 1.25 2010/03/12 15:23:39 nijtmans Exp $ +# RCS: @(#) $Id: rules.vc,v 1.26 2010/07/01 21:31:26 nijtmans Exp $ #------------------------------------------------------------------------------ !ifndef _RULES_VC @@ -559,7 +559,7 @@ 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\tclreg12$(SUFX:t=).lib" +TCLREGLIB = "$(_TCLDIR)\lib\tclreg13$(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 @@ -572,7 +572,7 @@ 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)\tclreg12$(SUFX:t=).lib" +TCLREGLIB = "$(_TCLDIR)\win\$(BUILDDIRTOP)\tclreg13$(SUFX:t=).lib" TCLDDELIB = "$(_TCLDIR)\win\$(BUILDDIRTOP)\tcldde13$(SUFX:t=).lib" COFFBASE = "$(_TCLDIR)\win\coffbase.txt" TCLTOOLSDIR = $(_TCLDIR)\tools |