summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpatthoyts <patthoyts@noemail.net>2004-09-06 13:45:28 (GMT)
committerpatthoyts <patthoyts@noemail.net>2004-09-06 13:45:28 (GMT)
commit2f692d1a431e238cdc04984996e19e88fb8928e9 (patch)
tree28ff7550436c9939bad7ecaaee4588a8f9025553
parentd11495312129ed5cf27d5850997978700150b256 (diff)
downloadtk-2f692d1a431e238cdc04984996e19e88fb8928e9.zip
tk-2f692d1a431e238cdc04984996e19e88fb8928e9.tar.gz
tk-2f692d1a431e238cdc04984996e19e88fb8928e9.tar.bz2
Set TK_LIBRARY when execing Tk apps (test, runtest, rundemo).
FossilOrigin-Name: 73a8f18872a4dca4165aea28d76d0b674a9c702a
-rw-r--r--ChangeLog5
-rw-r--r--win/makefile.vc5
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 69e53a0..8667d79 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-06 Pat Thoyts <patthoyts@users.sourceforge.net>
+
+ * win/makefile.vc: Set TK_LIBRARY when execing Tk apps (test,
+ runtest, rundemo).
+
2004-09-03 Donal K. Fellows <donal.k.fellows@man.ac.uk>
* macosx/tkMacOSXMenus.c (GenerateEditEvent):
diff --git a/win/makefile.vc b/win/makefile.vc
index 2563282..7000f9e 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -12,7 +12,7 @@
# Copyright (c) 2001-2004 David Gravereaux.
#
#------------------------------------------------------------------------------
-# RCS: @(#) $Id: makefile.vc,v 1.83 2004/03/09 03:35:08 davygrvy Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.84 2004/09/06 13:45:37 patthoyts Exp $
#------------------------------------------------------------------------------
!if "$(MSDEVDIR)" == ""
@@ -485,6 +485,7 @@ tktest: setup $(TKTEST) $(CAT32)
test: setup $(TKTEST) $(TKLIB) $(CAT32)
set TCL_LIBRARY=$(TCL_LIBRARY)
+ set TK_LIBRARY=$(ROOT)/library
!if $(TCLINSTALL)
set PATH=$(_TCLDIR)\bin;$(PATH)
!else
@@ -498,6 +499,7 @@ test: setup $(TKTEST) $(TKLIB) $(CAT32)
runtest: setup $(TKTEST) $(TKLIB) $(CAT32)
set TCL_LIBRARY=$(TCL_LIBRARY)
+ set TK_LIBRARY=$(ROOT)/library
!if $(TCLINSTALL)
set PATH=$(_TCLDIR)\bin;$(PATH)
!else
@@ -507,6 +509,7 @@ runtest: setup $(TKTEST) $(TKLIB) $(CAT32)
rundemo: setup $(TKTEST) $(TKLIB) $(CAT32)
set TCL_LIBRARY=$(TCL_LIBRARY)
+ set TK_LIBRARY=$(ROOT)/library
!if $(TCLINSTALL)
set PATH=$(_TCLDIR)\bin;$(PATH)
!else