summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--win/makefile.vc6
2 files changed, 12 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 1d9896c..e82f48e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,14 @@
+2000-07-19 Eric Melski <ericm@ajubasolutions.com>
+
+ * win/makefile.vc: Applied patch from Don Porter to provide better
+ nmake support for NT/Alpha [RFE: 5938].
+
2000-07-18 Mo DeJong <mdejong@redhat.com>
* unix/configure.in:
* unix/tcl.m4:
- * win/tcl.m4: Properly quote arguments to m4
- macros. This allows Tcl to work with the new
- version of autoconf.
+ * win/tcl.m4: Properly quote arguments to m4 macros. This allows
+ Tcl to work with the new version of autoconf.
2000-07-18 Eric Melski <ericm@ajubasolutions.com>
diff --git a/win/makefile.vc b/win/makefile.vc
index 7f3cc33..b79b62a 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -6,7 +6,7 @@
# Copyright (c) 1995-1996 Sun Microsystems, Inc.
# Copyright (c) 1998-1999 by Scriptics Corporation.
#
-# RCS: @(#) $Id: makefile.vc,v 1.52 2000/05/03 00:15:11 hobbs Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.53 2000/07/19 18:27:45 ericm Exp $
# Does not depend on the presence of any environment variables in
# order to compile tcl; all needed information is derived from
@@ -28,6 +28,7 @@
# Set this to the appropriate value of /MACHINE: for your platform
MACHINE = IX86
+#MACHINE = ALPHA
ROOT = ..
INSTALLDIR = c:\Progra~1\Tcl
@@ -35,6 +36,9 @@ INSTALLDIR = c:\Progra~1\Tcl
!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