summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordavygrvy <davygrvy@pobox.com>2004-01-10 00:24:55 (GMT)
committerdavygrvy <davygrvy@pobox.com>2004-01-10 00:24:55 (GMT)
commit50a50a083caae0e727ebf24c5c7a4243b242b06e (patch)
tree8eb0fe7732eba84c16292a220d872081566ecd43
parentf3f0d906a9fd21b7f70b6de0d1014009cf454ccf (diff)
downloadtcl-50a50a083caae0e727ebf24c5c7a4243b242b06e.zip
tcl-50a50a083caae0e727ebf24c5c7a4243b242b06e.tar.gz
tcl-50a50a083caae0e727ebf24c5c7a4243b242b06e.tar.bz2
Added -DTCL_NO_DEPRECATED usage to makefile.vc. Called like this:
nmake -af makefile.vc CHECKS=nodep
-rw-r--r--win/makefile.vc8
-rw-r--r--win/rules.vc21
2 files changed, 27 insertions, 2 deletions
diff --git a/win/makefile.vc b/win/makefile.vc
index f7eaa8d..fa2bc52 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -12,7 +12,7 @@
# Copyright (c) 2001-2002 David Gravereaux.
#
#------------------------------------------------------------------------------
-# RCS: @(#) $Id: makefile.vc,v 1.114 2003/12/23 02:38:23 davygrvy Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.115 2004/01/10 00:24:55 davygrvy Exp $
#------------------------------------------------------------------------------
!if "$(MSVCDIR)" == ""
@@ -94,6 +94,12 @@ the environment. Jump to this line to read the new instructions.
# memdbg = Enables the debugging memory allocator.
# compdbg = Enables byte compilation logging.
#
+# CHECKS=nodep,none
+# Sets special macros for checking compatability.
+#
+# nodep = Turns off compatability macros to ensure the core
+# isn't being built with deprecated functions.
+#
# MACHINE=(IX86|IA64|ALPHA)
# Set the machine type used for the compiler, linker, and
# resource compiler. This hook is needed to tell the tools
diff --git a/win/rules.vc b/win/rules.vc
index e0917f3..58ee9b2 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -10,7 +10,7 @@
# Copyright (c) 2001-2003 David Gravereaux.
#
#------------------------------------------------------------------------------
-# RCS: @(#) $Id: rules.vc,v 1.15 2003/12/23 02:19:13 davygrvy Exp $
+# RCS: @(#) $Id: rules.vc,v 1.16 2004/01/10 00:24:55 davygrvy Exp $
#------------------------------------------------------------------------------
!ifndef _RULES_VC
@@ -266,6 +266,22 @@ TCL_COMPILE_DEBUG = 0
#----------------------------------------------------------
+# Decode the checks requested.
+#----------------------------------------------------------
+
+!if "$(CHECKS)" == "" || [nmakehlp -f "$(CHECKS)" "none"]
+TCL_NO_DEPRECATED = 0
+!else
+!if [nmakehlp -f $(CHECKS) "nodep"]
+!message *** Doing nodep check
+TCL_NO_DEPRECATED = 1
+!else
+TCL_NO_DEPRECATED = 0
+!endif
+!endif
+
+
+#----------------------------------------------------------
# Set our defines now armed with our options.
#----------------------------------------------------------
@@ -286,6 +302,9 @@ OPTDEFINES = $(OPTDEFINES) -DUSE_THREAD_ALLOC=1
!if $(STATIC_BUILD)
OPTDEFINES = $(OPTDEFINES) -DSTATIC_BUILD
!endif
+!if $(TCL_NO_DEPRECATED)
+OPTDEFINES = $(OPTDEFINES) -DTCL_NO_DEPRECATED
+!endif
!if $(DEBUG)
OPTDEFINES = $(OPTDEFINES) -DTCL_CFG_DEBUG