summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhobbs <hobbs>2000-11-03 01:10:23 (GMT)
committerhobbs <hobbs>2000-11-03 01:10:23 (GMT)
commitfa7f5856e5f62fe12d2f7aa80d94ea5676c15e6a (patch)
treeb262655edd6eb0e8d5f93ecf7cdd07cbb21ac7b3
parentc2e90ea6af2571fcf719c01d5d42ea8c8d1b5960 (diff)
downloadtcl-fa7f5856e5f62fe12d2f7aa80d94ea5676c15e6a.zip
tcl-fa7f5856e5f62fe12d2f7aa80d94ea5676c15e6a.tar.gz
tcl-fa7f5856e5f62fe12d2f7aa80d94ea5676c15e6a.tar.bz2
updated default tools paths
-rw-r--r--win/makefile.vc23
1 files changed, 9 insertions, 14 deletions
diff --git a/win/makefile.vc b/win/makefile.vc
index 858873c..675ff54 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -1,4 +1,4 @@
-# Visual C++ 2.x and 4.0 makefile
+# Visual C++ makefile
#
# See the file "license.terms" for information on usage and redistribution
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
@@ -6,7 +6,7 @@
# Copyright (c) 1995-1996 Sun Microsystems, Inc.
# Copyright (c) 1998-2000 Ajuba Solutions.
#
-# RCS: @(#) $Id: makefile.vc,v 1.57 2000/11/02 09:21:07 hobbs Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.58 2000/11/03 01:10:23 hobbs Exp $
# Does not depend on the presence of any environment variables in
# order to compile tcl; all needed information is derived from
@@ -46,20 +46,15 @@ link32 = "$(TOOLS32)\bin\Win64\link.exe"
libpath32 = /LIBPATH:"$(TOOLS32)\lib\IA64"
lib32 = "$(TOOLS32)\bin\Win64\lib.exe"
-!ELSE IF "$(MACHINE)" == "ALPHA"
-
-TOOLS32 = C:\Progra~1\Micros~2\vc98
-TOOLS32_rc = C:\Progra~1\Micros~2\common\MSDev98
-
-cc32 = "$(TOOLS32)\bin\cl.exe"
-link32 = "$(TOOLS32)\bin\link.exe"
-libpath32 = /LIBPATH:"$(TOOLS32)\lib"
-lib32 = "$(TOOLS32)\bin\lib.exe"
-
!ELSE
-TOOLS32 = C:\Progra~1\devstudio\vc
-TOOLS32_rc = C:\Progra~1\devstudio\sharedide
+# Visual Studio 5 default
+#TOOLS32 = C:\Progra~1\devstudio\vc
+#TOOLS32_rc = C:\Progra~1\devstudio\sharedide
+
+# Visual Studio 6 default
+TOOLS32 = C:\Progra~1\Microsoft Visual Studio\VC98
+TOOLS32_rc = C:\Progra~1\Microsoft Visual Studio\common\MSDev98
cc32 = "$(TOOLS32)\bin\cl.exe"
link32 = "$(TOOLS32)\bin\link.exe"