diff options
| author | hobbs <hobbs> | 2001-10-01 21:04:37 (GMT) |
|---|---|---|
| committer | hobbs <hobbs> | 2001-10-01 21:04:37 (GMT) |
| commit | a74627fb69a680539bb1178aff3e55569d99a088 (patch) | |
| tree | 6c2fdd4d2eb2b2fb4b8d0589fd6d5fde3451bcea /win/makefile.vc | |
| parent | d7a9a366a69909448c51b92adf417d7cdfda1962 (diff) | |
| download | tk-a74627fb69a680539bb1178aff3e55569d99a088.zip tk-a74627fb69a680539bb1178aff3e55569d99a088.tar.gz tk-a74627fb69a680539bb1178aff3e55569d99a088.tar.bz2 | |
updated for Win64 SDK RC1 compilation support
Diffstat (limited to 'win/makefile.vc')
| -rw-r--r-- | win/makefile.vc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/win/makefile.vc b/win/makefile.vc index 2c4ebd6..48fc1e0 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -5,8 +5,9 @@ # # Copyright (c) 1995-1997 Sun Microsystems, Inc. # Copyright (c) 1998-2000 Ajuba Solutions. +# Copyright (c) 2001 ActiveState Corporation. # -# RCS: @(#) $Id: makefile.vc,v 1.40 2001/03/30 23:50:17 hobbs Exp $ +# RCS: @(#) $Id: makefile.vc,v 1.41 2001/10/01 21:04:37 hobbs Exp $ # Does not depend on the presence of any environment variables in # order to compile tcl; all needed information is derived from @@ -38,10 +39,10 @@ MACHINE = IX86 !IF "$(MACHINE)" == "IA64" # IA64 support is based on the standard setup with v2 of the -# Microsoft Platform SDK for Whistler, build 2267 +# Microsoft SDK for XP, RC1 -TOOLS32 = C:\Progra~1\Microsoft Platform SDK -TOOLS32_rc = C:\Progra~1\Microsoft Platform SDK +TOOLS32 = C:\Progra~1\Microsoft SDK +TOOLS32_rc = C:\Progra~1\Microsoft SDK cc32 = "$(TOOLS32)\bin\Win64\cl.exe" link32 = "$(TOOLS32)\bin\Win64\link.exe" @@ -255,16 +256,15 @@ RCDIR = $(WINDIR)\rc TK_INCLUDES = -I$(WINDIR) -I$(GENERICDIR) -I$(BITMAPDIR) -I$(XLIBDIR) \ -I$(TCLDIR)\generic -TK_DEFINES = -D__WIN32__ $(DEBUGDEFINES) $(THREADDEFINES) +TK_DEFINES = $(DEBUGDEFINES) $(THREADDEFINES) ###################################################################### # Compile flags ###################################################################### !IF "$(NODEBUG)" == "1" -!IF "$(MACHINE)" == "ALPHA" -# MSVC on Alpha doesn't understand -Ot -cdebug = -O2i -Gs -GD +!IF "$(MACHINE)" == "IA64" +cdebug = -O2i -Gs !ELSE # NOTE: Due to a bug in MSVC, we cannot use -O2 here or Tk starts to misbehave. cdebug = -Oti -Gs -GD |