diff options
| author | davygrvy <davygrvy@pobox.com> | 2004-02-07 21:47:19 (GMT) |
|---|---|---|
| committer | davygrvy <davygrvy@pobox.com> | 2004-02-07 21:47:19 (GMT) |
| commit | 9a6ad6f7e1625a6ce47f8b383c6deab9f7d1a79a (patch) | |
| tree | 71b132860f94c92cf4726d9431e969814ef41aec /win/rules.vc | |
| parent | 33d37367eefd25c2373ed2d0e7d5d33aaf0c4546 (diff) | |
| download | tcl-9a6ad6f7e1625a6ce47f8b383c6deab9f7d1a79a.zip tcl-9a6ad6f7e1625a6ce47f8b383c6deab9f7d1a79a.tar.gz tcl-9a6ad6f7e1625a6ce47f8b383c6deab9f7d1a79a.tar.bz2 | |
* win/makefile.vc:
* win/rules.vc:
* win/tcl.rc:
* win/tclsh.rc: Added an 'unchecked' option to the OPTS macro so a
core build with symbols can be linked to the non-debug enabled C
run-time. As per discussion with Kevin Kenny. Called like this:
nmake -af makefile.vc OPTS=unchecked,symbols
This clarifies the meaning of the 'g' naming suffix to mean only that
the binary requires the debug enabled C run-time. Whether the binary
contains symbols or not is a seperate condition.
Diffstat (limited to 'win/rules.vc')
| -rw-r--r-- | win/rules.vc | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/win/rules.vc b/win/rules.vc index f92ed11..0a102c9 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.17 2004/01/15 23:08:10 davygrvy Exp $ +# RCS: @(#) $Id: rules.vc,v 1.18 2004/02/07 21:47:19 davygrvy Exp $ #------------------------------------------------------------------------------ !ifndef _RULES_VC @@ -129,6 +129,7 @@ MSVCRT = 0 LOIMPACT = 0 TCL_USE_STATIC_PACKAGES = 0 USE_THREAD_ALLOC = 0 +UNCHECKED = 0 !else !if [nmakehlp -f $(OPTS) "static"] !message *** Doing static @@ -178,6 +179,12 @@ USE_THREAD_ALLOC = 1 !else USE_THREAD_ALLOC = 0 !endif +!if [nmakehlp -f $(OPTS) "unchecked"] +!message *** Doing unchecked +UNCHECKED = 1 +!else +UNCHECKED = 0 +!endif !endif @@ -195,14 +202,25 @@ TCL_USE_STATIC_PACKAGES = 0 # by accident. #---------------------------------------------------------- +#---------------------------------------- +# Naming convention: +# t = full thread support. +# s = static library (as opposed to an +# import library) +# g = linked to the debug enabled C +# run-time. +# x = special static build when it +# links to the dynamic C run-time. +#---------------------------------------- SUFX = tsgx !if $(DEBUG) BUILDDIRTOP = Debug -DBGX = g !else BUILDDIRTOP = Release -DBGX = +!endif + +!if !$(DEBUG) || $(DEBUG) && $(UNCHECKED) SUFX = $(SUFX:g=) !endif |