diff options
| author | hershey <hershey> | 1999-03-11 23:48:11 (GMT) |
|---|---|---|
| committer | hershey <hershey> | 1999-03-11 23:48:11 (GMT) |
| commit | 84360e8b2a79bc23ec47c1beafbe389f98c5eaec (patch) | |
| tree | 8593f5892d32585ca7ca07aa195d4edcc5c7c4ea /win | |
| parent | e51df2e36e5a3832d3b375f796c3dd30bb5c54ee (diff) | |
| download | tk-84360e8b2a79bc23ec47c1beafbe389f98c5eaec.zip tk-84360e8b2a79bc23ec47c1beafbe389f98c5eaec.tar.gz tk-84360e8b2a79bc23ec47c1beafbe389f98c5eaec.tar.bz2 | |
changed hardcoded reference to ../tests/all.tcl to use variable in its path.
Diffstat (limited to 'win')
| -rw-r--r-- | win/makefile.vc | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/win/makefile.vc b/win/makefile.vc index 9498c88..b58ff6f 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -4,7 +4,7 @@ # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # # Copyright (c) 1995-1997 Sun Microsystems, Inc. -# RCS: @(#) $Id: makefile.vc,v 1.1.4.15 1999/03/11 19:02:10 hershey Exp $ +# RCS: @(#) $Id: makefile.vc,v 1.1.4.16 1999/03/11 23:48:11 hershey Exp $ # Does not depend on the presence of any environment variables in # order to compile tcl; all needed information is derived from @@ -100,7 +100,8 @@ TKTESTOBJS = \ $(TMPDIR)\tkTest.obj \ $(TMPDIR)\tkSquare.obj \ $(TMPDIR)\testMain.obj \ - $(TMPDIR)\tkThreadTest.obj +# the tkThreadTest.c file has not been checked it yet. +# $(TMPDIR)\tkThreadTest.obj XLIBOBJS = \ $(TMPDIR)\xcolors.obj \ @@ -336,11 +337,11 @@ install: install-binaries install-libraries plugin: setup $(TKPLUGINDLL) $(WISHP) tktest: setup $(TKTEST) $(CAT32) test: setup $(TKTEST) $(TKLIB) $(CAT32) - copy $(TCLDIR)\bin\pkgIndex.tcl $(OUTDIR) set TCL_LIBRARY=$(TCLDIR)/library - $(TKTEST) << | $(CAT32) - source ../tests/all.tcl -<< + set PATH=$(TCLDIR)\win\$(TMPDIRNAME);$(PATH) + $(TKTEST) $(ROOT)/tests/all.tcl + +# copy $(TCLDIR)\bin\pkgIndex.tcl $(OUTDIR) console-wish : all $(WISHC) @@ -452,13 +453,13 @@ genstubs: # $(TMPDIR)\testMain.obj: $(ROOT)\win\winMain.c - $(cc32) $(TK_CFLAGS) -DTK_TEST -Fo$@ $? + $(cc32) $(WISH_CFLAGS) -DTK_TEST -Fo$@ $? $(TMPDIR)\tkTest.obj: $(ROOT)\generic\tkTest.c - $(cc32) $(TK_CFLAGS) -Fo$@ $? + $(cc32) $(WISH_CFLAGS) -Fo$@ $? $(TMPDIR)\tkSquare.obj: $(ROOT)\generic\tkSquare.c - $(cc32) $(TK_CFLAGS) -Fo$@ $? + $(cc32) $(WISH_CFLAGS) -Fo$@ $? $(TMPDIR)\winMain.obj: $(ROOT)\win\winMain.c $(cc32) $(WISH_CFLAGS) -Fo$@ $? |