summaryrefslogtreecommitdiffstats
path: root/win/rules.vc
diff options
context:
space:
mode:
authorpatthoyts <patthoyts@users.sourceforge.net>2006-10-18 08:56:21 (GMT)
committerpatthoyts <patthoyts@users.sourceforge.net>2006-10-18 08:56:21 (GMT)
commit1e8dfb3138ca2bade53d451a31df8d01be65d843 (patch)
treedcefe6334ff1101d026a8b15ab5bb79d419a103c /win/rules.vc
parentf8d578503dab648a62cf5b5c7c1145b070f2e3fe (diff)
downloadtk-1e8dfb3138ca2bade53d451a31df8d01be65d843.zip
tk-1e8dfb3138ca2bade53d451a31df8d01be65d843.tar.gz
tk-1e8dfb3138ca2bade53d451a31df8d01be65d843.tar.bz2
Ensure builds with VC6 without Platform SDK and pickup MACHINE from environment
to make life easier on Windows non-x86 platforms.
Diffstat (limited to 'win/rules.vc')
-rw-r--r--win/rules.vc9
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)'