summaryrefslogtreecommitdiffstats
path: root/win/rules.vc
diff options
context:
space:
mode:
authorpatthoyts <patthoyts@users.sourceforge.net>2007-09-12 14:23:06 (GMT)
committerpatthoyts <patthoyts@users.sourceforge.net>2007-09-12 14:23:06 (GMT)
commitb4e783e45a77d57ac3e8d3b49300bf378abd192e (patch)
treef7b32c7ee14cb0b45f9b4418990d4feba86fdda8 /win/rules.vc
parentd30c9675dd147e8905633d5e8545106d75a4dc58 (diff)
downloadtcl-b4e783e45a77d57ac3e8d3b49300bf378abd192e.zip
tcl-b4e783e45a77d57ac3e8d3b49300bf378abd192e.tar.gz
tcl-b4e783e45a77d57ac3e8d3b49300bf378abd192e.tar.bz2
Use nmakehlp to substitute values for tclConfig.sh (helps cross-compiling).
Diffstat (limited to 'win/rules.vc')
-rw-r--r--win/rules.vc16
1 files changed, 11 insertions, 5 deletions
diff --git a/win/rules.vc b/win/rules.vc
index 22208d2..e0c472e 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.29 2007/02/04 00:01:54 mistachkin Exp $
+# RCS: @(#) $Id: rules.vc,v 1.30 2007/09/12 14:23:08 patthoyts Exp $
#------------------------------------------------------------------------------
!ifndef _RULES_VC
@@ -401,7 +401,7 @@ FULLWARNINGS = 0
# Set our defines now armed with our options.
#----------------------------------------------------------
-OPTDEFINES = -DTCL_CFGVAL_ENCODING=$(CFG_ENCODING)
+OPTDEFINES = -DTCL_CFGVAL_ENCODING=$(CFG_ENCODING) -DSTDC_HEADERS
!if $(TCL_MEM_DEBUG)
OPTDEFINES = $(OPTDEFINES) -DTCL_MEM_DEBUG
@@ -536,9 +536,15 @@ TCLTOOLSDIR = $(_TCLDIR)\tools
!if [echo REM = This file is generated from rules.vc > versions.vc]
!endif
# Note we can do the Tcl and/or Tk version extraction
-#!if [echo TCL_DOTVERSION = \>> versions.vc] \
-# && [nmakehlp -V ..\generic\tcl.h TCL_VERSION >> versions.vc]
-#!endif
+!if [echo TCL_MAJOR_VERSION = \>> versions.vc] \
+ && [nmakehlp -V ..\generic\tcl.h TCL_MAJOR_VERSION >> versions.vc]
+!endif
+!if [echo TCL_MINOR_VERSION = \>> versions.vc] \
+ && [nmakehlp -V ..\generic\tcl.h TCL_MINOR_VERSION >> versions.vc]
+!endif
+!if [echo TCL_PATCH_LEVEL = \>> versions.vc] \
+ && [nmakehlp -V ..\generic\tcl.h TCL_PATCH_LEVEL >> versions.vc]
+!endif
!if [echo PKG_HTTP_VER = \>> versions.vc] \
&& [nmakehlp -V ..\library\http\pkgIndex.tcl http >> versions.vc]
!endif