summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpatthoyts <patthoyts@users.sourceforge.net>2008-05-15 00:06:18 (GMT)
committerpatthoyts <patthoyts@users.sourceforge.net>2008-05-15 00:06:18 (GMT)
commita4067b2f9b9e15de47baf424516fdc4bedd120e1 (patch)
tree743b550c96133c2302c5429c2c054ef30187f3c6
parent55409abda8f00f6af3def7318ec66de03beded37 (diff)
downloadtk-a4067b2f9b9e15de47baf424516fdc4bedd120e1.zip
tk-a4067b2f9b9e15de47baf424516fdc4bedd120e1.tar.gz
tk-a4067b2f9b9e15de47baf424516fdc4bedd120e1.tar.bz2
We should use the thread allocator for threaded builds. Added 'tclalloc' option to disable.
-rw-r--r--ChangeLog5
-rw-r--r--win/makefile.vc9
-rw-r--r--win/rules.vc7
3 files changed, 16 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 0c27119..1495f58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-15 Pat Thoyts <patthoyts@users.sourceforge.net>
+
+ * win/makefile.vc: We should use the thread allocator for threaded
+ * win/rules.vc: builds. Added 'tclalloc' option to disable.
+
2008-05-14 Donal K. Fellows <dkf@users.sf.net>
* generic/tkPanedWindow.c (PanedWindowProxyCommand)
diff --git a/win/makefile.vc b/win/makefile.vc
index a945084..b8a790e 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -1,4 +1,4 @@
-#------------------------------------------------------------------------------
+#------------------------------------------------------------- -*- makefile -*-
# makefile.vc --
#
# Microsoft Visual C++ makefile for use with nmake.exe v1.62+ (VC++ 5.0+)
@@ -10,9 +10,10 @@
# Copyright (c) 1998-2000 Ajuba Solutions.
# Copyright (c) 2001-2005 ActiveState Corporation.
# Copyright (c) 2001-2004 David Gravereaux.
+# Copyright (c) 2003-2008 Pat Thoyts.
#
#------------------------------------------------------------------------------
-# RCS: @(#) $Id: makefile.vc,v 1.121 2008/04/20 19:57:03 patthoyts Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.122 2008/05/15 00:06:19 patthoyts Exp $
#------------------------------------------------------------------------------
# Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR)
@@ -88,7 +89,9 @@ the build instructions.
# staticpkg= Affects the static option only to switch wishXX.exe
# to have the dde and reg extension linked inside it.
# threads = Turns on full multithreading support.
-# thrdalloc= Use the thread allocator (shared global free pool).
+# thrdalloc = Use the thread allocator (shared global free pool)
+# This is the default on threaded builds.
+# tclalloc = Use the old non-thread allocator
# symbols = Adds symbols for step debugging.
# profile = Adds profiling hooks. Map file is assumed.
# loimpact = Adds a flag for how NT treats the heap to keep
diff --git a/win/rules.vc b/win/rules.vc
index 0084520..73215e8 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -11,7 +11,7 @@
# Copyright (c) 2003-2007 Patrick Thoyts
#
#------------------------------------------------------------------------------
-# RCS: @(#) $Id: rules.vc,v 1.21 2007/12/13 15:28:52 dgp Exp $
+# RCS: @(#) $Id: rules.vc,v 1.22 2008/05/15 00:06:19 patthoyts Exp $
#------------------------------------------------------------------------------
!ifndef _RULES_VC
@@ -242,6 +242,7 @@ TCL_USE_STATIC_PACKAGES = 0
!if [nmakehlp -f $(OPTS) "threads"]
!message *** Doing threads
TCL_THREADS = 1
+USE_THREAD_ALLOC= 1
!else
TCL_THREADS = 0
!endif
@@ -266,7 +267,9 @@ LOIMPACT = 0
!if [nmakehlp -f $(OPTS) "thrdalloc"]
!message *** Doing thrdalloc
USE_THREAD_ALLOC = 1
-!else
+!endif
+!if [nmakehlp -f $(OPTS) "tclalloc"]
+!message *** Doing thrdalloc
USE_THREAD_ALLOC = 0
!endif
!if [nmakehlp -f $(OPTS) "unchecked"]