diff options
| author | patthoyts <patthoyts@noemail.net> | 2006-10-18 08:56:20 (GMT) |
|---|---|---|
| committer | patthoyts <patthoyts@noemail.net> | 2006-10-18 08:56:20 (GMT) |
| commit | f9b5d8a412439e955ee1cf3251ca37681dfbc983 (patch) | |
| tree | dcefe6334ff1101d026a8b15ab5bb79d419a103c /win/rules.vc | |
| parent | 2e929e6e139c0583985bf51e58d4b56af6b84177 (diff) | |
| download | tk-f9b5d8a412439e955ee1cf3251ca37681dfbc983.zip tk-f9b5d8a412439e955ee1cf3251ca37681dfbc983.tar.gz tk-f9b5d8a412439e955ee1cf3251ca37681dfbc983.tar.bz2 | |
Ensure builds with VC6 without Platform SDK and pickup MACHINE from environment
to make life easier on Windows non-x86 platforms.
FossilOrigin-Name: 854a284193d1143b75ac1ba436e87c0dbe38f1c3
Diffstat (limited to 'win/rules.vc')
| -rw-r--r-- | win/rules.vc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/win/rules.vc b/win/rules.vc index 46e0ec5..bfe285e 100644 --- a/win/rules.vc +++ b/win/rules.vc @@ -11,7 +11,7 @@ # Copyright (c) 2003-2006 Patrick Thoyts # #------------------------------------------------------------------------------ -# RCS: @(#) $Id: rules.vc,v 1.5.2.6 2006/10/06 18:10:41 patthoyts Exp $ +# RCS: @(#) $Id: rules.vc,v 1.5.2.7 2006/10/18 08:56:21 patthoyts Exp $ #------------------------------------------------------------------------------ !ifndef _RULES_VC @@ -31,7 +31,11 @@ _INSTALLDIR = $(INSTALLDIR:/=\) !endif !ifndef MACHINE +!if "$(CPU)" == "" MACHINE = IX86 +!else +MACHINE = $(CPU) +!endif !endif !ifndef CFG_ENCODING @@ -460,7 +464,6 @@ Failed to find tcl.h. The TCLDIR macro does not appear correct. #!endif TCL_DOTVERSION = 8.4 -TCL_PATCHLEVEL = .14 TCL_VERSION = $(TCL_DOTVERSION:.=) !if $(TCLINSTALL) @@ -494,7 +497,7 @@ TCLTOOLSDIR = $(_TCLDIR)\tools !message *** Output directory will be '$(OUT_DIR)' !message *** Suffix for binaries will be '$(SUFX)' !message *** Optional defines are '$(OPTDEFINES)' -!message *** Compiler version $(VCVER) +!message *** Compiler version $(VCVER), arch is $(MACHINE) !message *** Compiler options '$(OPTIMIZATIONS) $(DEBUGFLAGS)' !message *** Link options '$(LINKERFLAGS)' |