summaryrefslogtreecommitdiffstats
path: root/win/makefile.vc
diff options
context:
space:
mode:
authorescoffon <escoffon>1998-08-03 15:48:31 (GMT)
committerescoffon <escoffon>1998-08-03 15:48:31 (GMT)
commit622ca64595ff70d8ab17aad14471162b8031d86e (patch)
treecfe13add72a800b0b623cacfd6a67a3e84aff13c /win/makefile.vc
parentcfd5a0c1409cdbe96ab7280337eafd4be706a4e1 (diff)
downloadtk-622ca64595ff70d8ab17aad14471162b8031d86e.zip
tk-622ca64595ff70d8ab17aad14471162b8031d86e.tar.gz
tk-622ca64595ff70d8ab17aad14471162b8031d86e.tar.bz2
a few more tweaks to fix support for specifyin the directory where binaries
are built.
Diffstat (limited to 'win/makefile.vc')
-rw-r--r--win/makefile.vc10
1 files changed, 6 insertions, 4 deletions
diff --git a/win/makefile.vc b/win/makefile.vc
index ae8f2f5..e39b312 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-1996 Sun Microsystems, Inc.
-# SCCS: %Z% $Id: makefile.vc,v 1.9 1998/07/30 12:34:55 escoffon Exp $
+# SCCS: %Z% $Id: makefile.vc,v 1.10 1998/08/03 15:48:31 escoffon Exp $
# Does not depend on the presence of any environment variables in
# order to compile tcl; all needed information is derived from
@@ -50,12 +50,14 @@ VERSION = 80
BINROOT = .
!IF "$(NODEBUG)" == "1"
-TMPDIR = $(BINROOT)\Release
+TMPDIRNAME = Release
DBGX =
!ELSE
-TMPDIR = $(BINROOT)\Debug
+TMPDIRNAME = Debug
DBGX = d
!ENDIF
+TMPDIR = $(BINROOT)\$(TMPDIRNAME)
+OUTDIRNAME = $(TMPDIRNAME)
OUTDIR = $(TMPDIR)
TCLLIB = $(TCLNAMEPREFIX)$(VERSION)$(DBGX).lib
@@ -191,7 +193,7 @@ WINDIR = $(ROOT)\win
GENERICDIR = $(ROOT)\generic
XLIBDIR = $(ROOT)\xlib
BITMAPDIR = $(ROOT)\bitmaps
-TCLLIBDIR = $(TCLDIR)\win\$(OUTDIR)
+TCLLIBDIR = $(TCLDIR)\win\$(OUTDIRNAME)
RCDIR = $(WINDIR)\rc
TK_INCLUDES = -I$(WINDIR) -I$(GENERICDIR) -I$(BITMAPDIR) -I$(XLIBDIR) \