summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authordavygrvy <davygrvy>2002-02-01 23:20:29 (GMT)
committerdavygrvy <davygrvy>2002-02-01 23:20:29 (GMT)
commitc9546a8c47eafeef10d9e28d8478c53295d90c4c (patch)
treed9116edc1bb580d4b1536599dc669b3b8a236fb6 /win
parent342d1b17982724c7c0bb3eb04790371b58644c3c (diff)
downloadtk-c9546a8c47eafeef10d9e28d8478c53295d90c4c.zip
tk-c9546a8c47eafeef10d9e28d8478c53295d90c4c.tar.gz
tk-c9546a8c47eafeef10d9e28d8478c53295d90c4c.tar.bz2
* win/makefile.vc: unset macro located in the tktest target caused a failure.
[Bug 511652]
Diffstat (limited to 'win')
-rw-r--r--win/makefile.vc6
1 files changed, 4 insertions, 2 deletions
diff --git a/win/makefile.vc b/win/makefile.vc
index 3293c36..50240b9 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -12,7 +12,7 @@
# Copyright (c) 2001 Tomasoft Engineering.
#
#------------------------------------------------------------------------------
-# RCS: @(#) $Id: makefile.vc,v 1.49 2001/12/03 10:42:31 davygrvy Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.50 2002/02/01 23:20:29 davygrvy Exp $
#------------------------------------------------------------------------------
!if "$(MSVCDIR)" == ""
@@ -204,6 +204,7 @@ TCLIMPLIB = $(INSTALLDIR)\lib\$(TCLIMPLIBNAME)
TCL_LIBRARY = $(INSTALLDIR)\lib
TCLREGLIB = $(INSTALLDIR)\lib\$(TCLREGLIBNAME)
TCLDDELIB = $(INSTALLDIR)\lib\$(TCLDDELIBNAME)
+TCLTMP_DIR = \must\have\tcl\sources\to\build\this\target
!else
TCLSH = $(TCLDIR)\win\$(BUILDDIRTOP)\$(TCLNAMEPREFIX)sh$(VERSION)$(SUFX).exe
TCLSTUBLIB = $(TCLDIR)\win\$(BUILDDIRTOP)\$(TCLSTUBLIBNAME)
@@ -211,6 +212,7 @@ TCLIMPLIB = $(TCLDIR)\win\$(BUILDDIRTOP)\$(TCLIMPLIBNAME)
TCL_LIBRARY = $(TCLDIR)\library
TCLREGLIB = $(TCLDIR)\win\$(BUILDDIRTOP)\$(TCLREGLIBNAME)
TCLDDELIB = $(TCLDIR)\win\$(BUILDDIRTOP)\$(TCLDDELIBNAME)
+TCLTMP_DIR = $(TCLDIR)\win\$(TMP_DIR:tk=tcl)
!endif
WISH = $(OUT_DIR)\$(WISHNAMEPREFIX)$(VERSION)$(SUFX).exe
@@ -245,7 +247,7 @@ TKTESTOBJS = \
$(TMP_DIR)\tkSquare.obj \
$(TMP_DIR)\testMain.obj \
$(TMP_DIR)\tkWinTest.obj \
- $(TCLLIBDIR)\tclThreadTest.obj
+ $(TCLTMP_DIR)\tclThreadTest.obj
XLIBOBJS = \
$(TMP_DIR)\xcolors.obj \