diff options
| author | davygrvy <davygrvy@pobox.com> | 2003-01-05 00:44:24 (GMT) |
|---|---|---|
| committer | davygrvy <davygrvy@pobox.com> | 2003-01-05 00:44:24 (GMT) |
| commit | 215d930311562a1a9628b22e607a9a5f52666aab (patch) | |
| tree | 8765cc89a9dfb7b53c99f092ab50319cbbe3f8c1 /win/rules.vc | |
| parent | c471b0fb6cfe23fbec6d5ccdbd73b0f99e34da4d (diff) | |
| download | tcl-215d930311562a1a9628b22e607a9a5f52666aab.zip tcl-215d930311562a1a9628b22e607a9a5f52666aab.tar.gz tcl-215d930311562a1a9628b22e607a9a5f52666aab.tar.bz2 | |
* win/makefile.vc:
* win/rules.vc: Fixed INSTALLDIR macro problem that blanked itself
by accident causing the install target to put the tree at the root
of the drive built on. Whoops..
Renamed the 'linkexten' option to be 'staticpkg'. Added 'thrdalloc'
to allow the switching _on_ of the thread allocator. Under testing,
I found it not to be benificial under windows for the purpose of the
application I was using it for. It was more important for this app
that resources for tcl threads be returned to the system rather than
saved/moved to the global recycler. Be extra clean or extra fast
for the default threaded build? Let's move to clean and allow it to
be switched on for users who find it benificial for their use of
threads.
Diffstat (limited to 'win/rules.vc')
| -rw-r--r-- | win/rules.vc | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/win/rules.vc b/win/rules.vc index 0bc3469..583d8e9 100644 --- a/win/rules.vc +++ b/win/rules.vc @@ -10,7 +10,7 @@ # Copyright (c) 2001-2002 David Gravereaux. # #------------------------------------------------------------------------------ -# RCS: @(#) $Id: rules.vc,v 1.9 2002/11/04 05:50:19 davygrvy Exp $ +# RCS: @(#) $Id: rules.vc,v 1.10 2003/01/05 00:44:24 davygrvy Exp $ #------------------------------------------------------------------------------ !ifndef _RULES_VC @@ -36,10 +36,12 @@ MACHINE = IX86 #---------------------------------------------------------- # Set the proper copy method to avoid overwrite questions -# to the user when copying files. +# to the user when copying files and selecting the right +# "delete all" method. #---------------------------------------------------------- !if "$(OS)" == "Windows_NT" +RMDIR = rmdir /S /Q !if ![ver | find "4.0" > nul] CPY = echo y | xcopy /i !else @@ -47,6 +49,7 @@ CPY = xcopy /i /y !endif !else CPY = xcopy /i +RMDIR = deltree /Y !endif @@ -122,6 +125,7 @@ PROFILE = 0 MSVCRT = 0 LOIMPACT = 0 TCL_USE_STATIC_PACKAGES = 0 +USE_THREAD_ALLOC = 0 !else !if [nmakehlp -f $(OPTS) "static"] !message *** Doing static @@ -135,8 +139,8 @@ MSVCRT = 1 !else MSVCRT = 0 !endif -!if [nmakehlp -f $(OPTS) "linkexten"] -!message *** Doing linkexten +!if [nmakehlp -f $(OPTS) "staticpkg"] +!message *** Doing staticpkg TCL_USE_STATIC_PACKAGES = 1 !else TCL_USE_STATIC_PACKAGES = 0 @@ -165,6 +169,12 @@ LOIMPACT = 1 !else LOIMPACT = 0 !endif +!if [nmakehlp -f $(OPTS) "thrdalloc"] +!message *** Doing thrdalloc +USE_THREAD_ALLOC = 1 +!else +USE_THREAD_ALLOC = 0 +!endif !endif @@ -253,7 +263,7 @@ TCL_COMPILE_DEBUG = 0 #---------------------------------------------------------- -# Set our defines armed with our options. +# Set our defines now armed with our options. #---------------------------------------------------------- OPTDEFINES = @@ -265,6 +275,9 @@ OPTDEFINES = $(OPTDEFINES) -DTCL_COMPILE_DEBUG -DTCL_COMPILE_STATS !endif !if $(TCL_THREADS) OPTDEFINES = $(OPTDEFINES) -DTCL_THREADS=1 +!if $(USE_THREAD_ALLOC) +OPTDEFINES = $(OPTDEFINES) -DUSE_THREAD_ALLOC=1 +!endif !endif !if $(STATIC_BUILD) OPTDEFINES = $(OPTDEFINES) -DSTATIC_BUILD @@ -301,7 +314,7 @@ Don't know where tcl.h is. The TCLDIR macro doesn't appear correct. ### TODO: add a command to nmakehlp.c to grep for Tcl's version from tcl.h. ### Because nmake can't return a string, we'll need to play games with return -### codes :) It might look something like this: +### codes. It might look something like this: #!if [nmakehlp -g $(TCL.H)] == 81 #TCL_DOTVERSION = 8.1 #!elseif [nmakehlp -g $(TCL.H)] == 82 |