summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorericm <ericm>2000-07-20 15:20:52 (GMT)
committerericm <ericm>2000-07-20 15:20:52 (GMT)
commit3637e82c594032d763b96863c8169c234d99913d (patch)
tree1032421a07bb1e55fad3bee0d9dbae7649457ebc
parent4c85d14a216327baa1f5a4d7b74995e0bfd0fde7 (diff)
downloadtk-3637e82c594032d763b96863c8169c234d99913d.zip
tk-3637e82c594032d763b96863c8169c234d99913d.tar.gz
tk-3637e82c594032d763b96863c8169c234d99913d.tar.bz2
Applied patch from [RFE: 5939]
-rw-r--r--ChangeLog5
-rw-r--r--win/makefile.vc6
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 42d1917..687b06e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-07-20 Eric Melski <ericm@ajubasolutions.com>
+
+ * win/makefile.vc: Applied patch from Don Porter to enhance nmake
+ support on NT/Alpha [RFE: 5939].
+
2000-07-19 Eric Melski <ericm@ajubasolutions.com>
* library/text.tcl: Enhanced <Tab> binding to behave like normal
diff --git a/win/makefile.vc b/win/makefile.vc
index 124891d..693a792 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.34 2000/05/03 00:18:37 hobbs Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.35 2000/07/20 15:20:52 ericm Exp $
# Does not depend on the presence of any environment variables in
# order to compile tcl; all needed information is derived from
@@ -31,10 +31,14 @@ INSTALLDIR = c:\progra~1\tcl
# Set this to the appropriate value of /MACHINE: for your platform
MACHINE = IX86
+#MACHINE = ALPHA
!IF "$(MACHINE)" == "IA64"
TOOLS32 = c:\ia64sdk17
TOOLS32_rc = c:\ia64sdk17
+!ELSE IF "$(MACHINE)" == "ALPHA"
+TOOLS32 = C:\Progra~1\Micros~2\vc98
+TOOLS32_rc = C:\Progra~1\Micros~2\common\MSDev98
!ELSE
TOOLS32 = c:\Progra~1\devstudio\vc
TOOLS32_rc = c:\Progra~1\devstudio\sharedide