* macosx/Wish.xcodeproj/project.pbxproj: extract build settings that

	* macosx/Wish.xcodeproj/default.pbxuser:   were common to multiple
	* macosx/Wish-Common.xcconfig (new file):  configurations into external
	* macosx/Wish-Debug.xcconfig (new file):   xcconfig files; add extra
	* macosx/Wish-Release.xcconfig (new file): configurations for building
	with SDKs; convert legacy jam-based 'Tk' target to native target with
	single script phase; correct syntax of build setting references to use
	$() throughout; remove unused tcltest sources from 'tktest' target.

	* macosx/README: document new Wish.xcodeproj configurations; other
	minor updates/corrections.

	* generic/tk.h: update location of version numbers in macosx files.

	* macosx/Wish.xcode/project.pbxproj: restore 'tktest' target to working
	* macosx/Wish.xcode/default.pbxuser: order by replicating applicable
	changes to Wish.xcodeproj since 2006-07-20.

8 files changed, 925 insertions, 475 deletions

diff --git a/macosx/README b/macosx/README
index cfc5977..4bef580 100644
--- a/macosx/README
+++ b/macosx/README
@@ -1,7 +1,7 @@
 Tcl/Tk Mac OS X README 
 ----------------------
 
-RCS: @(#) $Id: README,v 1.21 2006/10/16 15:56:54 das Exp $
+RCS: @(#) $Id: README,v 1.22 2007/01/28 01:42:16 das Exp $
 
 This is the README file for the Mac OS X/Darwin version of Tcl/Tk.
 
@@ -73,11 +73,11 @@ the Resources/Scripts directory of the framework.
 and bundles are also loaded more efficiently from VFS (no temporary copy to the
 native filesystem required).
 
-- The 'deploy' target of macosx/Makefile installs the html manpages into the
+- The 'deploy' target of macosx/GNUmakefile installs the html manpages into the
 standard documentation location in the Tcl/Tk frameworks:
 	Tcl.framework/Resources/Documentation/Reference/Tcl
 	Tk.framework/Resources/Documentation/Reference/Tk
-No nroff manpages are installed by default by the Makefiles.
+No nroff manpages are installed by default by the GNUmakefiles.
 
 - The Tcl and Tk frameworks can be installed in any of the system's standard
 framework directories:
@@ -91,11 +91,11 @@ framework directories:
 "-psn_XXXX" argument. This is the Wish's carbon process serial number, you may
 need to filter it out for cross platform compatibility of your scripts.
 
-- the env array is different when Wish is started from the Finder than when it
-(or tclsh) is invoked from the Terminal, in particular PATH may not be what you
-expect. (Wish started from the Finder inherits the Finder's environment
-variables, which are essentially those set in $HOME/.MacOSX/environment.plist
-and not those set by your shell configuration files).
+- the env array is different when Wish is started from the Finder (i.e. via
+LaunchServices) than when it (or tclsh) is invoked from the Terminal, in
+particular PATH may not be what you expect. (Wish started by LaunchServices
+inherits loginwindow's environment variables, which are essentially those set in
+$HOME/.MacOSX/environment.plist, and are unrelated to those set in your shell).
 
 - As of Tk 8.4.7, TkAqua has a version of the low-level drawing primitives using
 the CoreGraphics routines - the code is primarily due to James Tittle.  There
@@ -110,7 +110,7 @@ control whether a line/shape is drawn antialiased. The antialiasing threshold is
 0 by default (i.e. antialias everything), it can be changed by setting
 	set tk::mac::CGAntialiasLimit <limit>
 in your script before drawing, in which case lines (or shapes with outlines)
-thinner that <limit> pixels will not be antialiased.
+thinner than <limit> pixels will not be antialiased.
 
 - ATSUI text antialiasing by default uses the standard OS antialising settings.
 Setting the global variable '::tk::mac::antialiasedtext' allows to control text
@@ -118,7 +118,7 @@ antialiasing from Tcl: a value of 1 enables AA, 0 disables AA and -1 restores
 the default behaviour of respecting the OS settings.
 
 - Scrollbars: There are two scrollbar variants in Aqua, normal & small. The
-normal scrollbar has a small dimension of 16, the small variant 12. Access to
+normal scrollbar has a small dimension of 15, the small variant 11. Access to
 the small variant was added in Tk 8.4.2.
 
 - Cursors: You can now put up and spin the Classic MacOS spinner, and the
@@ -137,11 +137,10 @@ So, for instance this code will spin the spinner:
     }
 This was added in Tk 8.4.2
 
-- If you want to use Remote Debugging with Xcode 1.5 or 2.2, then you need to
-set the environment variable XCNOSTDIN to 1 in the Executable editor for Wish.
-That will cause us to force closing stdin & stdout.  Otherwise, given how Xcode
-launches Wish remotely, they will be left open and then Wish & gdb will fight
-for stdin...
+- If you want to use Remote Debugging with Xcode 1.5 or 2.2, you need to set the
+environment variable XCNOSTDIN to 1 in the Executable editor for Wish. That will
+cause us to force closing stdin & stdout.  Otherwise, given how Xcode launches
+Wish remotely, they will be left open and then Wish & gdb will fight for stdin.
 
 
 3. Building Tcl/Tk on Mac OS X
@@ -155,10 +154,10 @@ installer is available on Mac OS X retail disks or is present in
 recent version can be downloaded from the ADC website http://connect.apple.com
 (after you register for free ADC membership).
 
-- Tcl/Tk are most easily built as Mac OS X frameworks via Makefile in
+- Tcl/Tk are most easily built as Mac OS X frameworks via GNUmakefile in
 tcl/macosx and tk/macosx (see below for details), but can also be built with the
 standard unix configure and make buildsystem in tcl/unix resp. tk/unix as on any
-other unix platform (indeed, the Makefiles are just wrappers around the unix
+other unix platform (indeed, the GNUmakefiles are just wrappers around the unix
 buildsystem).
 The Mac OS X specific configure flags are --enable-aqua, --enable-framework and
 --disable-corefoundation (which disables CF and notably reverts to the standard
@@ -174,9 +173,18 @@ take care to only use the project matching your DevTools and OS version:
 	target useful for debugging, this target's 'Development' buildstyle
 	has ZeroLink and Fix&Continue enabled, use the 'DevelNoFixZL' buildstyle
 	if you need a debug build without these features.
-    * Wish.xcodeproj for Xcode 2.2 on 10.4, this additionally has a
-	'ReleaseUniversal'configuration which builds both the 'Tk' and the
-	'tktest' targets as universal binaries for ppc and i386. 
+    * Wish.xcodeproj for Xcode 2.4 on 10.4, which has the following
+	additional configurations for the 'Tk' and 'tktest' targets:
+	'ReleaseUniversal': builds the targets as universal binaries for the
+		ppc and i386 architectures.
+	'ReleaseUniversal10.4uSDK': same as 'ReleaseUniversal' but builds
+		against the 10.4u SDK, required to build universal binaries on
+		PowerPC Tiger (where the system libraries are not universal).
+	'ReleasePPC10.3.9SDK': builds for PowerPC against the 10.3.9 SDK, useful
+		for verifying on Tiger that building on Panther would succeed.
+	'ReleasePPC10.2.8SDK': builds for PowerPC with gcc-3.3 against the
+		10.2.8 SDK, useful to verify on Tiger that building on Jaguar
+		would succeed.
 Notes about the native targets of the Xcode projects:
     * the Xcode projects refer to the tcl and tk source dirs with a relative
 	path of ../../tcl and ../../tk to the project location, if your source
@@ -200,9 +208,9 @@ Notes about the native targets of the Xcode projects:
     export CFLAGS="-arch ppc -arch i386 \
 	-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4"
 This requires Mac OS X 10.4 and Xcode 2.2 (_not_ Xcode 2.1) and will work on any
-of the architectures (on intel Macs, the -isysroot may not be required). Note
-that it is not possible to configure universal builds correctly if the current
-architecture is not present in CFLAGS (i.e. -arch `arch` must be there).
+of the architectures (the -isysroot flag is only required on PowerPC Tiger).
+Note that configure requires CFLAGS to contain a least one architecture that can
+be run on the build machine (i.e. ppc on PowerPC, ppc or i386 on Intel).
 Universal builds of Tk TEA extensions are also possible with CFLAGS set as
 above, they will be [load]able by universal as well as thin binaries of Tk.
 Note that while Tcl can be built for 64-bit architectures, neither TkAqua nor
@@ -220,11 +228,11 @@ This requires Mac OS X 10.2 and gcc 3.1; if you have gcc 4 or later you can set
 CFLAGS instead:
     export CFLAGS="-mmacosx-version-min=10.2"
 The Wish.xcodeproj is setup to produce binaries that can run on 10.2 or later,
-except for the 'ReleaseUniversal'configuration, where they require 10.4.
+except for the 'ReleaseUniversal*' configurations, where they require 10.4.
 Support for weak-linking was added to the code for 8.4.14/8.5a5.
 
-Detailed Instructions for building with macosx/Makefile
--------------------------------------------------------
+Detailed Instructions for building with macosx/GNUmakefile
+----------------------------------------------------------
 
 - Unpack the Tcl and Tk source release archives and place the tcl and tk source
 trees in a common parent directory.
@@ -259,26 +267,26 @@ instead by passing an INSTALL_ROOT argument to make:
 	make -C tcl${ver}/macosx install INSTALL_ROOT="${HOME}/"
 	make -C tk${ver}/macosx  install INSTALL_ROOT="${HOME}/"
 
-- The default Makefile targets will build _both_ debug and optimized versions of
-the Tcl and Tk frameworks with the standard convention of naming the debug
+- The default GNUmakefile targets will build _both_ debug and optimized versions
+of the Tcl and Tk frameworks with the standard convention of naming the debug
 library Tcl.framework/Tcl_debug resp. Tk.framework/Tk_debug.
 This allows switching to the debug libraries at runtime by setting
 	export DYLD_IMAGE_SUFFIX=_debug
 (c.f. man dyld for more details)
 
 If you only want to build and install the debug or optimized build, use the
-'develop' or 'deploy' target variants of the Makefiles, respectively.
+'develop' or 'deploy' target variants of the GNUmakefiles, respectively.
 For example, to build and install only the optimized versions:
 	make -C tcl${ver}/macosx deploy
 	make -C tk${ver}/macosx deploy
 	sudo make -C tcl${ver}/macosx install-deploy
 	sudo make -C tk${ver}/macosx  install-deploy
 
-- The Makefiles can also build a version of 'Wish' that has the Tcl and Tk
+- The GNUmakefiles can also build a version of 'Wish' that has the Tcl and Tk
 frameworks embedded in its application package. This allows for standalone
 deployment of the application with no installation required, e.g. from read-only
 media. To build & install in this manner, use the 'embedded' target variants of
-the Makefiles. For example, to build a standalone 'Wish.app'
+the GNUmakefiles. For example, to build a standalone 'Wish.app'
 in ./embedded/Applications/Utilities:
 	make -C tcl${ver}/macosx embedded
 	make -C tk${ver}/macosx embedded
@@ -298,7 +306,7 @@ still need a tcl sourcetree in the location specified in TCL_SRC_DIR in
 Tcl.framework/tclConfig.sh. Also, linking with Tcl.framework has to work exactly
 as indicated in TCL_LIB_SPEC in Tcl.framework/tclConfig.sh.
 If you used non-default install locations for Tcl.framework, specify them as
-make overrides to the tk/macosx Makefile, e.g.
+make overrides to the tk/macosx GNUmakefile, e.g.
 	make -C tk${ver}/macosx \
 	    TCL_FRAMEWORK_DIR=$HOME/Library/Frameworks TCLSH_DIR=$HOME/usr/bin
 	sudo make -C tk${ver}/macosx install \
diff --git a/macosx/Wish-Common.xcconfig b/macosx/Wish-Common.xcconfig
new file mode 100644
index 0000000..1500f88
--- /dev/null
+++ b/macosx/Wish-Common.xcconfig
@@ -0,0 +1,47 @@
+// 
+// Wish-Common.xcconfig --
+//
+//	This file contains the Xcode build settings comon to all
+//	project configurations in Wish.xcodeproj.
+//
+// Copyright (c) 2007 Daniel A. Steffen <das@users.sourceforge.net>
+//
+// See the file "license.terms" for information on usage and redistribution
+// of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+//
+// RCS: @(#) $Id: Wish-Common.xcconfig,v 1.1 2007/01/28 01:42:16 das Exp $
+//
+
+HEADER_SEARCH_PATHS = $(TK_SRCROOT)/generic $(TK_SRCROOT)/xlib $(DERIVED_FILE_DIR)/tcl $(DERIVED_FILE_DIR)/tk $(HEADER_SEARCH_PATHS)
+REZ_SEARCH_PATHS = $(TK_SRCROOT)/generic $(TCL_SRCROOT)/generic $(REZ_SEARCH_PATHS)
+OTHER_LDFLAGS = -headerpad_max_install_names -sectcreate __TEXT __tk_rsrc $(REZ_COLLECTOR_DIR)/$(PRODUCT_NAME).rsrc $(OTHER_LDFLAGS)
+INSTALL_PATH = "$(BINDIR)"
+GCC_PREFIX_HEADER = $(DERIVED_FILE_DIR)/tk/tkConfig.h
+OTHER_CFLAGS = -imacros $(DERIVED_FILE_DIR)/tcl/tclConfig.h $(OTHER_CFLAGS)
+GCC_GENERATE_DEBUGGING_SYMBOLS = YES
+GCC_NO_COMMON_BLOCKS = YES
+GCC_DYNAMIC_NO_PIC = YES
+WARNING_CFLAGS_GCC3 = -Wall -Wno-implicit-int -Wno-unused-parameter -Wno-deprecated-declarations $(WARNING_CFLAGS)
+WARNING_CFLAGS = -Wextra -Wno-missing-field-initializers $(WARNING_CFLAGS_GCC3)
+REZ_RESOURCE_MAP_READ_ONLY = YES
+APPLICATION_INSTALL_PATH = /Applications/Utilities
+BINDIR = $(PREFIX)/bin
+CFLAGS = $(CFLAGS)
+CPPFLAGS = -mmacosx-version-min=$(MACOSX_DEPLOYMENT_TARGET) $(CPPFLAGS)
+FRAMEWORK_INSTALL_PATH = /Library/Frameworks
+INCLUDEDIR = $(PREFIX)/include
+LIBDIR = $(PREFIX)/lib
+MANDIR = $(PREFIX)/man
+PER_ARCH_CFLAGS_ppc = -mcpu=G3 -mtune=G4 $(PER_ARCH_CFLAGS_ppc)
+PREFIX = /usr/local
+TCL_BUILD_DIR = $(OBJROOT)/../tcl/Tcl.build/$(CONFIGURATION)/Tcl.build/Objects
+TCL_CONFIGURE_ARGS = --enable-threads
+TCL_FRAMEWORK_DIR = $(SYMROOT)/../tcl/$(CONFIGURATION)
+TCL_LIBRARY = $(LIBDIR)/tcl$(VERSION)
+TCL_PACKAGE_PATH = "$(LIBDIR)"
+TCL_SRCROOT = $(SRCROOT)/../../tcl
+TCL_DEFS = HAVE_TCL_CONFIG_H
+TK_LIBRARY = $(LIBDIR)/tk$(VERSION)
+TK_SRCROOT = $(SRCROOT)/../../tk
+TK_DEFS = HAVE_TK_CONFIG_H TCL_NO_DEPRECATED
+VERSION = 8.5
diff --git a/macosx/Wish-Debug.xcconfig b/macosx/Wish-Debug.xcconfig
new file mode 100644
index 0000000..14e80fd
--- /dev/null
+++ b/macosx/Wish-Debug.xcconfig
@@ -0,0 +1,22 @@
+// 
+// Wish-Debug.xcconfig --
+//
+//	This file contains the Xcode build settings for all Debug
+//	project configurations in Wish.xcodeproj.
+//
+// Copyright (c) 2007 Daniel A. Steffen <das@users.sourceforge.net>
+//
+// See the file "license.terms" for information on usage and redistribution
+// of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+//
+// RCS: @(#) $Id: Wish-Debug.xcconfig,v 1.1 2007/01/28 01:42:16 das Exp $
+//
+
+#include "Wish-Common.xcconfig"
+
+DEBUG_INFORMATION_FORMAT = dwarf
+DEPLOYMENT_POSTPROCESSING = NO
+GCC_OPTIMIZATION_LEVEL = 0
+GCC_PREPROCESSOR_DEFINITIONS = DEBUG_ASSERT_PRODUCTION_CODE=0 $(TCL_DEFS) $(TK_DEFS) $(GCC_PREPROCESSOR_DEFINITIONS)
+CONFIGURE_ARGS = --enable-symbols $(TCL_CONFIGURE_ARGS) $(CONFIGURE_ARGS)
+MAKE_TARGET = develop
diff --git a/macosx/Wish-Release.xcconfig b/macosx/Wish-Release.xcconfig
new file mode 100644
index 0000000..4bcc74c
--- /dev/null
+++ b/macosx/Wish-Release.xcconfig
@@ -0,0 +1,22 @@
+// 
+// Wish-Release.xcconfig --
+//
+//	This file contains the Xcode build settings for all Release
+//	project configurations in Wish.xcodeproj.
+//
+// Copyright (c) 2007 Daniel A. Steffen <das@users.sourceforge.net>
+//
+// See the file "license.terms" for information on usage and redistribution
+// of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+//
+// RCS: @(#) $Id: Wish-Release.xcconfig,v 1.1 2007/01/28 01:42:16 das Exp $
+//
+
+#include "Wish-Common.xcconfig"
+
+DEBUG_INFORMATION_FORMAT = dwarf-with-dsym
+DEPLOYMENT_POSTPROCESSING = YES
+GCC_OPTIMIZATION_LEVEL = s
+GCC_PREPROCESSOR_DEFINITIONS = NDEBUG $(TCL_DEFS) $(TK_DEFS) $(GCC_PREPROCESSOR_DEFINITIONS)
+CONFIGURE_ARGS = --disable-symbols $(TCL_CONFIGURE_ARGS) $(CONFIGURE_ARGS)
+MAKE_TARGET = deploy
diff --git a/macosx/Wish.xcode/default.pbxuser b/macosx/Wish.xcode/default.pbxuser
index 2136106..9740be4 100644
--- a/macosx/Wish.xcode/default.pbxuser
+++ b/macosx/Wish.xcode/default.pbxuser
@@ -68,7 +68,7 @@
 		customDataFormattersEnabled = 1;
 		debuggerPlugin = GDBDebugging;
 		disassemblyDisplayState = 0;
-		dylibVariantSuffix = _debug;
+		dylibVariantSuffix = "";
 		enableDebugStr = 0;
 		environmentEntries = (
 			{
@@ -163,7 +163,7 @@
 		customDataFormattersEnabled = 1;
 		debuggerPlugin = GDBDebugging;
 		disassemblyDisplayState = 0;
-		dylibVariantSuffix = _debug;
+		dylibVariantSuffix = "";
 		enableDebugStr = 0;
 		environmentEntries = (
 			{
diff --git a/macosx/Wish.xcode/project.pbxproj b/macosx/Wish.xcode/project.pbxproj
index 50e8159..81abdac 100644
--- a/macosx/Wish.xcode/project.pbxproj
+++ b/macosx/Wish.xcode/project.pbxproj
@@ -134,12 +134,12 @@
 				GCC_MODEL_TUNING = G4;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_PREFIX_HEADER = "${DERIVED_FILE_DIR}/tk/tkConfig.h";
-				GCC_PREPROCESSOR_DEFINITIONS = "HAVE_TK_CONFIG_H TCL_NO_DEPRECATED HAVE_TCL_CONFIG_H TCL_TOMMATH MP_PREC=4";
-				HEADER_SEARCH_PATHS = "${TK_SRCROOT}/xlib ${DERIVED_FILE_DIR}/tcl ${DERIVED_FILE_DIR}/tk";
+				GCC_PREPROCESSOR_DEFINITIONS = "HAVE_TK_CONFIG_H TCL_NO_DEPRECATED HAVE_TCL_CONFIG_H";
+				HEADER_SEARCH_PATHS = "${TK_SRCROOT}/generic ${TK_SRCROOT}/xlib ${DERIVED_FILE_DIR}/tcl ${DERIVED_FILE_DIR}/tk";
 				INCLUDEDIR = "${PREFIX}/include";
 				INSTALL_PATH = "${BINDIR}";
 				LIBDIR = "${PREFIX}/lib";
-				MACOSX_DEPLOYMENT_TARGET = 10.3;
+				MACOSX_DEPLOYMENT_TARGET = 10.2;
 				MANDIR = "${PREFIX}/man";
 				OTHER_CFLAGS = "-imacros ${DERIVED_FILE_DIR}/tcl/tclConfig.h";
 				OTHER_LDFLAGS = "-headerpad_max_install_names -sectcreate __TEXT __tk_rsrc ${REZ_COLLECTOR_DIR}/${PRODUCT_NAME}.rsrc";
@@ -214,7 +214,6 @@
 				F96D45AC08F272BC004A47F5,
 				F96D45AD08F272BC004A47F5,
 				F96D45AE08F272BC004A47F5,
-				F96D45AF08F272BC004A47F5,
 				F96D45B008F272BC004A47F5,
 				F96D45B108F272BC004A47F5,
 				F96D45B208F272BC004A47F5,
@@ -434,6 +433,39 @@
 				F966C02C08F27A42005CB29B,
 				F966C02D08F27A42005CB29B,
 				F966C02E08F27A42005CB29B,
+				F9DD11670B38F7220017FBB9,
+				F9DD11900B38F7AB0017FBB9,
+				F9DD11910B38F7AB0017FBB9,
+				F9DD11920B38F7AB0017FBB9,
+				F9DD11930B38F7AB0017FBB9,
+				F9DD11940B38F7AB0017FBB9,
+				F9DD11950B38F7AB0017FBB9,
+				F9DD11960B38F7AB0017FBB9,
+				F9DD11970B38F7AB0017FBB9,
+				F9DD11980B38F7AB0017FBB9,
+				F9DD11990B38F7AB0017FBB9,
+				F9DD119A0B38F7AB0017FBB9,
+				F9DD119B0B38F7AB0017FBB9,
+				F9DD119C0B38F7AB0017FBB9,
+				F9DD119D0B38F7AB0017FBB9,
+				F9DD119E0B38F7AB0017FBB9,
+				F9DD119F0B38F7AB0017FBB9,
+				F9DD11A00B38F7AB0017FBB9,
+				F9DD11A10B38F7AB0017FBB9,
+				F9DD11A20B38F7AB0017FBB9,
+				F9DD11A30B38F7AB0017FBB9,
+				F9DD11A40B38F7AB0017FBB9,
+				F9DD11A50B38F7AB0017FBB9,
+				F9DD11A60B38F7AB0017FBB9,
+				F9DD11A70B38F7AB0017FBB9,
+				F9DD11A80B38F7AB0017FBB9,
+				F9DD11A90B38F7AB0017FBB9,
+				F9DD11AA0B38F7AB0017FBB9,
+				F9DD11AB0B38F7AB0017FBB9,
+				F9DD11AC0B38F7AB0017FBB9,
+				F9DD11AD0B38F7AB0017FBB9,
+				F9DD11AE0B38F7AB0017FBB9,
+				F9DD11B60B390A0D0017FBB9,
 			);
 			isa = PBXSourcesBuildPhase;
 			runOnlyForDeploymentPostprocessing = 0;
@@ -2027,6 +2059,7 @@
 				F966BB1008F27A39005CB29B,
 				F966BB1108F27A39005CB29B,
 				F966BB1208F27A39005CB29B,
+				F9DD116A0B38F7AA0017FBB9,
 			);
 			isa = PBXGroup;
 			path = generic;
@@ -3731,6 +3764,7 @@
 				F966BBF308F27A3C005CB29B,
 				F966BBF408F27A3C005CB29B,
 				F966BBF508F27A3C005CB29B,
+				F9DD11660B38F7220017FBB9,
 				F966BBF708F27A3C005CB29B,
 				F966BBF808F27A3C005CB29B,
 			);
@@ -5553,7 +5587,6 @@
 			children = (
 				F966BCEE08F27A3E005CB29B,
 				F966BCEF08F27A3E005CB29B,
-				F966BCF008F27A3E005CB29B,
 				F966BCF208F27A3E005CB29B,
 			);
 			isa = PBXGroup;
@@ -5577,14 +5610,6 @@
 			refType = 4;
 			sourceTree = "<group>";
 		};
-		F966BCF008F27A3E005CB29B = {
-			fileEncoding = 4;
-			isa = PBXFileReference;
-			lastKnownFileType = text.xml;
-			path = wish.exe.manifest;
-			refType = 4;
-			sourceTree = "<group>";
-		};
 		F966BCF208F27A3E005CB29B = {
 			fileEncoding = 4;
 			isa = PBXFileReference;
@@ -8747,7 +8772,6 @@
 				F96D3F0D08F272A7004A47F5,
 				F96D3F0E08F272A7004A47F5,
 				F96D3F0F08F272A7004A47F5,
-				F96D3F1008F272A7004A47F5,
 				F96D3F1108F272A7004A47F5,
 				F96D3F1208F272A7004A47F5,
 				F96D3F1308F272A7004A47F5,
@@ -9351,14 +9375,6 @@
 			refType = 4;
 			sourceTree = "<group>";
 		};
-		F96D3F1008F272A7004A47F5 = {
-			fileEncoding = 4;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.c;
-			path = tclParseExpr.c;
-			refType = 4;
-			sourceTree = "<group>";
-		};
 		F96D3F1108F272A7004A47F5 = {
 			fileEncoding = 4;
 			isa = PBXFileReference;
@@ -12392,7 +12408,6 @@
 				F96D442208F272B8004A47F5,
 				F96D442408F272B8004A47F5,
 				F96D442508F272B8004A47F5,
-				F96D442608F272B8004A47F5,
 				F96D442708F272B8004A47F5,
 				F96D442808F272B8004A47F5,
 				F96D442908F272B8004A47F5,
@@ -12468,14 +12483,6 @@
 			refType = 4;
 			sourceTree = "<group>";
 		};
-		F96D442608F272B8004A47F5 = {
-			explicitFileType = text.script;
-			fileEncoding = 4;
-			isa = PBXFileReference;
-			path = genWinImage.tcl;
-			refType = 4;
-			sourceTree = "<group>";
-		};
 		F96D442708F272B8004A47F5 = {
 			explicitFileType = text.script;
 			fileEncoding = 4;
@@ -12667,6 +12674,7 @@
 				F96D445D08F272B9004A47F5,
 				F96D445E08F272B9004A47F5,
 				F96D445F08F272B9004A47F5,
+				F9DD11B50B390A0D0017FBB9,
 				F96D446008F272B9004A47F5,
 				F96D446108F272B9004A47F5,
 				F96D446208F272B9004A47F5,
@@ -13061,7 +13069,6 @@
 				F96D447808F272BA004A47F5,
 				F96D447908F272BA004A47F5,
 				F96D447A08F272BA004A47F5,
-				F96D447B08F272BA004A47F5,
 				F96D447C08F272BA004A47F5,
 				F96D447D08F272BA004A47F5,
 				F96D447E08F272BA004A47F5,
@@ -13186,14 +13193,6 @@
 			refType = 4;
 			sourceTree = "<group>";
 		};
-		F96D447B08F272BA004A47F5 = {
-			fileEncoding = 4;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = README.binary;
-			refType = 4;
-			sourceTree = "<group>";
-		};
 		F96D447C08F272BA004A47F5 = {
 			fileEncoding = 4;
 			isa = PBXFileReference;
@@ -13711,12 +13710,6 @@
 			settings = {
 			};
 		};
-		F96D45AF08F272BC004A47F5 = {
-			fileRef = F96D3F1008F272A7004A47F5;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
 		F96D45B008F272BC004A47F5 = {
 			fileRef = F96D3F1108F272A7004A47F5;
 			isa = PBXBuildFile;
@@ -14335,14 +14328,14 @@
 		};
 		F9A3082D08F2D4AB00BAE1AB = {
 			isa = PBXFileReference;
-			lastKnownFileType = wrapper.framework;
+			lastKnownFileType = file;
 			path = Tk.framework;
 			refType = 3;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
 		F9A3084B08F2D4CE00BAE1AB = {
 			isa = PBXFileReference;
-			lastKnownFileType = wrapper.application;
+			lastKnownFileType = file;
 			path = Wish.app;
 			refType = 3;
 			sourceTree = BUILT_PRODUCTS_DIR;
@@ -14392,6 +14385,561 @@
 			shellPath = /bin/bash;
 			shellScript = "## tk configure shell script phase\n\ncd \"${TK_SRCROOT}\"/macosx &&\nif [ configure.ac -nt configure -o ../unix/configure.in -nt configure -o ../unix/tcl.m4 -nt configure -o ../unix/aclocal.m4 -nt configure ]; then\n    echo \"Running autoconf & autoheader in tk/macosx\"\n    rm -rf autom4te.cache\n    ${AUTOCONF:-/usr/local/bin/autoconf-2.59} && ${AUTOHEADER:-/usr/local/bin/autoheader-2.59}\n    rm -rf autom4te.cache\nfi\n\ncd \"${DERIVED_FILE_DIR}\" && mkdir -p tk && cd tk &&\nif [ \"${TK_SRCROOT}\"/macosx/configure -nt config.status ]; then\n    \"${TK_SRCROOT}\"/macosx/configure --cache-file=../config.cache --prefix=${PREFIX} --bindir=${BINDIR} --libdir=${LIBDIR} --mandir=${MANDIR} --includedir=${INCLUDEDIR} --disable-shared --enable-aqua --with-tcl=../tcl ${CONFIGURE_ARGS}\nelse\n    ./config.status\nfi";
 		};
+		F9DD11660B38F7220017FBB9 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
+			path = ttkMacOSXTheme.c;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		F9DD11670B38F7220017FBB9 = {
+			fileRef = F9DD11660B38F7220017FBB9;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F9DD116A0B38F7AA0017FBB9 = {
+			children = (
+				F9DD116B0B38F7AA0017FBB9,
+				F9DD116C0B38F7AA0017FBB9,
+				F9DD116D0B38F7AA0017FBB9,
+				F9DD116E0B38F7AA0017FBB9,
+				F9DD116F0B38F7AA0017FBB9,
+				F9DD11700B38F7AA0017FBB9,
+				F9DD11710B38F7AA0017FBB9,
+				F9DD11720B38F7AA0017FBB9,
+				F9DD11730B38F7AA0017FBB9,
+				F9DD11740B38F7AA0017FBB9,
+				F9DD11750B38F7AA0017FBB9,
+				F9DD11760B38F7AA0017FBB9,
+				F9DD11770B38F7AA0017FBB9,
+				F9DD11780B38F7AA0017FBB9,
+				F9DD11790B38F7AA0017FBB9,
+				F9DD117A0B38F7AA0017FBB9,
+				F9DD117B0B38F7AA0017FBB9,
+				F9DD117C0B38F7AA0017FBB9,
+				F9DD117D0B38F7AA0017FBB9,
+				F9DD117E0B38F7AA0017FBB9,
+				F9DD117F0B38F7AA0017FBB9,
+				F9DD11800B38F7AA0017FBB9,
+				F9DD11810B38F7AA0017FBB9,
+				F9DD11820B38F7AA0017FBB9,
+				F9DD11830B38F7AA0017FBB9,
+				F9DD11840B38F7AA0017FBB9,
+				F9DD11850B38F7AA0017FBB9,
+				F9DD11860B38F7AA0017FBB9,
+				F9DD11870B38F7AA0017FBB9,
+				F9DD11880B38F7AA0017FBB9,
+				F9DD11890B38F7AA0017FBB9,
+				F9DD118A0B38F7AA0017FBB9,
+				F9DD118B0B38F7AA0017FBB9,
+				F9DD118C0B38F7AB0017FBB9,
+				F9DD118D0B38F7AB0017FBB9,
+				F9DD118E0B38F7AB0017FBB9,
+				F9DD118F0B38F7AB0017FBB9,
+			);
+			isa = PBXGroup;
+			path = ttk;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		F9DD116B0B38F7AA0017FBB9 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = text;
+			path = ttk.decls;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		F9DD116C0B38F7AA0017FBB9 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
+			path = ttkBlink.c;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		F9DD116D0B38F7AA0017FBB9 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
+			path = ttkButton.c;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		F9DD116E0B38F7AA0017FBB9 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
+			path = ttkCache.c;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		F9DD116F0B38F7AA0017FBB9 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
+			path = ttkClamTheme.c;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		F9DD11700B38F7AA0017FBB9 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
+			path = ttkClassicTheme.c;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		F9DD11710B38F7AA0017FBB9 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
+			path = ttkDecls.h;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		F9DD11720B38F7AA0017FBB9 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
+			path = ttkDefaultTheme.c;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		F9DD11730B38F7AA0017FBB9 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
+			path = ttkElements.c;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		F9DD11740B38F7AA0017FBB9 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
+			path = ttkEntry.c;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		F9DD11750B38F7AA0017FBB9 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
+			path = ttkFrame.c;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		F9DD11760B38F7AA0017FBB9 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
+			path = ttkImage.c;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		F9DD11770B38F7AA0017FBB9 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
+			path = ttkInit.c;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		F9DD11780B38F7AA0017FBB9 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
+			path = ttkLabel.c;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		F9DD11790B38F7AA0017FBB9 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
+			path = ttkLayout.c;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		F9DD117A0B38F7AA0017FBB9 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
+			path = ttkManager.c;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		F9DD117B0B38F7AA0017FBB9 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
+			path = ttkManager.h;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		F9DD117C0B38F7AA0017FBB9 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
+			path = ttkNotebook.c;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		F9DD117D0B38F7AA0017FBB9 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
+			path = ttkPanedwindow.c;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		F9DD117E0B38F7AA0017FBB9 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
+			path = ttkProgress.c;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		F9DD117F0B38F7AA0017FBB9 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
+			path = ttkScale.c;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		F9DD11800B38F7AA0017FBB9 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
+			path = ttkScroll.c;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		F9DD11810B38F7AA0017FBB9 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
+			path = ttkScrollbar.c;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		F9DD11820B38F7AA0017FBB9 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
+			path = ttkSeparator.c;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		F9DD11830B38F7AA0017FBB9 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
+			path = ttkSquare.c;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		F9DD11840B38F7AA0017FBB9 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
+			path = ttkState.c;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		F9DD11850B38F7AA0017FBB9 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
+			path = ttkStubInit.c;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		F9DD11860B38F7AA0017FBB9 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
+			path = ttkStubLib.c;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		F9DD11870B38F7AA0017FBB9 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
+			path = ttkTagSet.c;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		F9DD11880B38F7AA0017FBB9 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
+			path = ttkTheme.c;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		F9DD11890B38F7AA0017FBB9 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
+			path = ttkTheme.h;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		F9DD118A0B38F7AA0017FBB9 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
+			path = ttkThemeInt.h;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		F9DD118B0B38F7AA0017FBB9 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
+			path = ttkTrace.c;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		F9DD118C0B38F7AB0017FBB9 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
+			path = ttkTrack.c;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		F9DD118D0B38F7AB0017FBB9 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
+			path = ttkTreeview.c;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		F9DD118E0B38F7AB0017FBB9 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
+			path = ttkWidget.c;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		F9DD118F0B38F7AB0017FBB9 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
+			path = ttkWidget.h;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		F9DD11900B38F7AB0017FBB9 = {
+			fileRef = F9DD116C0B38F7AA0017FBB9;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F9DD11910B38F7AB0017FBB9 = {
+			fileRef = F9DD116D0B38F7AA0017FBB9;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F9DD11920B38F7AB0017FBB9 = {
+			fileRef = F9DD116E0B38F7AA0017FBB9;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F9DD11930B38F7AB0017FBB9 = {
+			fileRef = F9DD116F0B38F7AA0017FBB9;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F9DD11940B38F7AB0017FBB9 = {
+			fileRef = F9DD11700B38F7AA0017FBB9;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F9DD11950B38F7AB0017FBB9 = {
+			fileRef = F9DD11720B38F7AA0017FBB9;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F9DD11960B38F7AB0017FBB9 = {
+			fileRef = F9DD11730B38F7AA0017FBB9;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F9DD11970B38F7AB0017FBB9 = {
+			fileRef = F9DD11740B38F7AA0017FBB9;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F9DD11980B38F7AB0017FBB9 = {
+			fileRef = F9DD11750B38F7AA0017FBB9;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F9DD11990B38F7AB0017FBB9 = {
+			fileRef = F9DD11760B38F7AA0017FBB9;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F9DD119A0B38F7AB0017FBB9 = {
+			fileRef = F9DD11770B38F7AA0017FBB9;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F9DD119B0B38F7AB0017FBB9 = {
+			fileRef = F9DD11780B38F7AA0017FBB9;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F9DD119C0B38F7AB0017FBB9 = {
+			fileRef = F9DD11790B38F7AA0017FBB9;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F9DD119D0B38F7AB0017FBB9 = {
+			fileRef = F9DD117A0B38F7AA0017FBB9;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F9DD119E0B38F7AB0017FBB9 = {
+			fileRef = F9DD117C0B38F7AA0017FBB9;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F9DD119F0B38F7AB0017FBB9 = {
+			fileRef = F9DD117D0B38F7AA0017FBB9;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F9DD11A00B38F7AB0017FBB9 = {
+			fileRef = F9DD117E0B38F7AA0017FBB9;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F9DD11A10B38F7AB0017FBB9 = {
+			fileRef = F9DD117F0B38F7AA0017FBB9;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F9DD11A20B38F7AB0017FBB9 = {
+			fileRef = F9DD11800B38F7AA0017FBB9;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F9DD11A30B38F7AB0017FBB9 = {
+			fileRef = F9DD11810B38F7AA0017FBB9;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F9DD11A40B38F7AB0017FBB9 = {
+			fileRef = F9DD11820B38F7AA0017FBB9;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F9DD11A50B38F7AB0017FBB9 = {
+			fileRef = F9DD11830B38F7AA0017FBB9;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F9DD11A60B38F7AB0017FBB9 = {
+			fileRef = F9DD11840B38F7AA0017FBB9;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F9DD11A70B38F7AB0017FBB9 = {
+			fileRef = F9DD11850B38F7AA0017FBB9;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F9DD11A80B38F7AB0017FBB9 = {
+			fileRef = F9DD11860B38F7AA0017FBB9;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F9DD11A90B38F7AB0017FBB9 = {
+			fileRef = F9DD11870B38F7AA0017FBB9;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F9DD11AA0B38F7AB0017FBB9 = {
+			fileRef = F9DD11880B38F7AA0017FBB9;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F9DD11AB0B38F7AB0017FBB9 = {
+			fileRef = F9DD118B0B38F7AA0017FBB9;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F9DD11AC0B38F7AB0017FBB9 = {
+			fileRef = F9DD118C0B38F7AB0017FBB9;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F9DD11AD0B38F7AB0017FBB9 = {
+			fileRef = F9DD118D0B38F7AB0017FBB9;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F9DD11AE0B38F7AB0017FBB9 = {
+			fileRef = F9DD118E0B38F7AB0017FBB9;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F9DD11B50B390A0D0017FBB9 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
+			path = tclUnixCompat.c;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		F9DD11B60B390A0D0017FBB9 = {
+			fileRef = F9DD11B50B390A0D0017FBB9;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
 		F9E61D16090A3E94002B3151 = {
 			buildArgumentsString = "-c \"cd \\\"${TK_SRCROOT}/macosx\\\"  && ACTION=${ACTION} && CFLAGS=\\\"${CFLAGS}\\\" gnumake \\${ACTION:+\\${ACTION/clean/distclean}-}${MAKE_TARGET} INSTALL_ROOT=\\\"${DSTROOT}\\\" INSTALL_PATH=\\\"${INSTALL_PATH}\\\" PREFIX=\\\"${PREFIX}\\\" BINDIR=\\\"${BINDIR}\\\" MANDIR=\\\"${MANDIR}\\\" TCL_BUILD_DIR=\\\"${TCL_BUILD_DIR}\\\" APPLICATION_INSTALL_PATH=\\\"${APPLICATION_INSTALL_PATH}\\\" \\${EXTRA_MAKE_FLAGS} ${ALL_SETTINGS} && touch -c dummy \\\"${OBJROOT}/${PROJECT_NAME}\\\".build/*.build/tktest.build/Objects-*/*/tkAppInit.o 2>&-\"";
 			buildPhases = (
diff --git a/macosx/Wish.xcodeproj/default.pbxuser b/macosx/Wish.xcodeproj/default.pbxuser
index 3625a77..eb4e7cd 100644
--- a/macosx/Wish.xcodeproj/default.pbxuser
+++ b/macosx/Wish.xcodeproj/default.pbxuser
@@ -6,11 +6,11 @@
 		activeTarget = F9E61D16090A3E94002B3151 /* Tk */;
 		codeSenseManager = F944EB9D08F798180049FDD4 /* Code sense */;
 		executables = (
-			F944EB8F08F798100049FDD4 /* tktest */,
 			F9E61D1C090A4282002B3151 /* Wish */,
+			F944EB8F08F798100049FDD4 /* tktest */,
 		);
 		perUserDictionary = {
-			com.apple.ide.smrt.PBXUserSmartGroupsKey.Rev10 = <040b747970656473747265616d8103e88401408484840e4e534d757461626c654172726179008484074e534172726179008484084e534f626a65637400858401690192848484134e534d757461626c6544696374696f6e6172790084840c4e5344696374696f6e6172790095960792848484084e53537472696e67019584012b146162736f6c75746550617468546f42756e646c658692849a9a008692849a9a046e616d658692849a9a14496d706c656d656e746174696f6e2046696c65738692849a9a03636c7a8692849a9a1550425846696c656e616d65536d61727447726f75708692849a9a0b6465736372697074696f6e8692849a9a103c6e6f206465736372697074696f6e3e8692849a9a08676c6f62616c49448692849a9a183143433045413430303433353045463930303434343130428692849a9a195042585472616e7369656e744c6f636174696f6e4174546f708692849a9a06626f74746f6d8692849a9a0b707265666572656e63657386928497960892849a9a1250425850726f6a65637453636f70654b65798692849a9a035945538692849a9a05696d6167658692849a9a0b536d617274466f6c6465728692849a9a0763616e536176658692848484084e534e756d626572008484074e5356616c7565009584012a849696018692849a9a0572656765788692849a9a225c2e28637c6370707c437c4350507c6d7c6d6d7c6a6176617c73687c7363707429248692849a9a04726f6f748692849a9a093c50524f4a4543543e8692849a9a097265637572736976658692ad92849a9a0669734c656166869284ae9db096008692849a9a07666e6d617463688692849a9a0086868686>;
+			com.apple.ide.smrt.PBXUserSmartGroupsKey.Rev10 = <040b73747265616d747970656481e8038401408484840e4e534d757461626c654172726179008484074e534172726179008484084e534f626a65637400858401690192848484134e534d757461626c6544696374696f6e6172790084840c4e5344696374696f6e6172790095960792848484084e53537472696e67019584012b146162736f6c75746550617468546f42756e646c658692849a9a008692849a9a046e616d658692849a9a14496d706c656d656e746174696f6e2046696c65738692849a9a03636c7a8692849a9a1550425846696c656e616d65536d61727447726f75708692849a9a0b6465736372697074696f6e8692849a9a103c6e6f206465736372697074696f6e3e8692849a9a08676c6f62616c49448692849a9a183143433045413430303433353045463930303434343130428692849a9a195042585472616e7369656e744c6f636174696f6e4174546f708692849a9a06626f74746f6d8692849a9a0b707265666572656e63657386928497960892849a9a1250425850726f6a65637453636f70654b65798692849a9a035945538692849a9a05696d6167658692849a9a0b536d617274466f6c6465728692849a9a0763616e536176658692848484084e534e756d626572008484074e5356616c7565009584012a849696018692849a9a0572656765788692849a9a225c2e28637c6370707c437c4350507c6d7c6d6d7c6a6176617c73687c7363707429248692849a9a04726f6f748692849a9a093c50524f4a4543543e8692849a9a097265637572736976658692ad92849a9a0669734c656166869284ae9db096008692849a9a07666e6d617463688692849a9a0086868686>;
 		};
 		sourceControlManager = F944EB9C08F798180049FDD4 /* Source Control */;
 		userBuildSettings = {
@@ -35,7 +35,7 @@
 		);
 		argumentStrings = (
 			"${SRCROOT}/../../tk/library/demos/widget",
-			"${SRCROOT}/../../tcl/tests/all.tcl",
+			"${SRCROOT}/../../tk/library/demos/ttk_demo.tcl",
 			"${SRCROOT}/../../tk/tests/all.tcl",
 			"-singleproc 1",
 			"-verbose \"bet\"",
@@ -87,6 +87,11 @@
 				value = /Library/Tcl;
 			},
 			{
+				active = YES;
+				name = MallocBadFreeAbort;
+				value = 1;
+			},
+			{
 				active = NO;
 				name = DYLD_PRINT_LIBRARIES;
 			},
@@ -116,15 +121,20 @@
 	};
 	F9E61D16090A3E94002B3151 /* Tk */ = {
 		activeExec = 0;
+		executables = (
+			F9E61D1C090A4282002B3151 /* Wish */,
+		);
 	};
 	F9E61D1C090A4282002B3151 /* Wish */ = {
 		isa = PBXExecutable;
 		activeArgIndex = 0;
 		activeArgIndices = (
 			YES,
+			NO,
 		);
 		argumentStrings = (
 			"${SRCROOT}/../../tk/library/demos/widget",
+			"${SRCROOT}/../../tk/library/demos/ttk_demo.tcl",
 		);
 		autoAttachOnCrash = 1;
 		configStateDict = {
@@ -158,23 +168,12 @@
 		enableDebugStr = 0;
 		environmentEntries = (
 			{
-				active = YES;
-				name = DYLD_FRAMEWORK_PATH;
-				value = "${SYMROOT}";
-			},
-			{
-				active = YES;
-				name = DYLD_LIBRARY_PATH;
-				value = "${SYMROOT}";
-			},
-			{
 				active = NO;
 				name = DYLD_PRINT_LIBRARIES;
 			},
 		);
 		executableSystemSymbolLevel = 0;
 		executableUserSymbolLevel = 0;
-		launchableReference = F9E61D1D090A4282002B3151 /* Wish.app */;
 		libgmallocEnabled = 0;
 		name = Wish;
 		savedGlobals = {
@@ -182,11 +181,4 @@
 		sourceDirectories = (
 		);
 	};
-	F9E61D1D090A4282002B3151 /* Wish.app */ = {
-		isa = PBXFileReference;
-		explicitFileType = wrapper.application;
-		name = Wish.app;
-		path = ../Wish.app;
-		sourceTree = BUILT_PRODUCTS_DIR;
-	};
 }
diff --git a/macosx/Wish.xcodeproj/project.pbxproj b/macosx/Wish.xcodeproj/project.pbxproj
index 0383aef..1f4be63 100644
--- a/macosx/Wish.xcodeproj/project.pbxproj
+++ b/macosx/Wish.xcodeproj/project.pbxproj
@@ -98,7 +98,7 @@
 		F966BEEA08F27A40005CB29B /* tkMacOSXEvent.c in Sources */ = {isa = PBXBuildFile; fileRef = F966BBD408F27A3B005CB29B /* tkMacOSXEvent.c */; };
 		F966BEEC08F27A40005CB29B /* tkMacOSXFont.c in Sources */ = {isa = PBXBuildFile; fileRef = F966BBD608F27A3B005CB29B /* tkMacOSXFont.c */; };
 		F966BEED08F27A40005CB29B /* tkMacOSXHLEvents.c in Sources */ = {isa = PBXBuildFile; fileRef = F966BBD708F27A3B005CB29B /* tkMacOSXHLEvents.c */; };
-		F966BEEE08F27A40005CB29B /* tkMacOSXInit.c in Sources */ = {isa = PBXBuildFile; fileRef = F966BBD808F27A3B005CB29B /* tkMacOSXInit.c */; settings = {COMPILER_FLAGS = "-DTK_LIBRARY=\\\"${TK_LIBRARY}\\\""; }; };
+		F966BEEE08F27A40005CB29B /* tkMacOSXInit.c in Sources */ = {isa = PBXBuildFile; fileRef = F966BBD808F27A3B005CB29B /* tkMacOSXInit.c */; settings = {COMPILER_FLAGS = "-DTK_LIBRARY=\\\"$(TK_LIBRARY)\\\""; }; };
 		F966BEF108F27A40005CB29B /* tkMacOSXKeyboard.c in Sources */ = {isa = PBXBuildFile; fileRef = F966BBDB08F27A3B005CB29B /* tkMacOSXKeyboard.c */; };
 		F966BEF208F27A40005CB29B /* tkMacOSXKeyEvent.c in Sources */ = {isa = PBXBuildFile; fileRef = F966BBDC08F27A3B005CB29B /* tkMacOSXKeyEvent.c */; };
 		F966BEF308F27A40005CB29B /* tkMacOSXMenu.c in Sources */ = {isa = PBXBuildFile; fileRef = F966BBDD08F27A3B005CB29B /* tkMacOSXMenu.c */; };
@@ -206,7 +206,7 @@
 		F96D45B008F272BC004A47F5 /* tclPathObj.c in Sources */ = {isa = PBXBuildFile; fileRef = F96D3F1108F272A7004A47F5 /* tclPathObj.c */; };
 		F96D45B108F272BC004A47F5 /* tclPipe.c in Sources */ = {isa = PBXBuildFile; fileRef = F96D3F1208F272A7004A47F5 /* tclPipe.c */; };
 		F96D45B208F272BC004A47F5 /* tclPkg.c in Sources */ = {isa = PBXBuildFile; fileRef = F96D3F1308F272A7004A47F5 /* tclPkg.c */; };
-		F96D45B308F272BC004A47F5 /* tclPkgConfig.c in Sources */ = {isa = PBXBuildFile; fileRef = F96D3F1408F272A7004A47F5 /* tclPkgConfig.c */; settings = {COMPILER_FLAGS = "-DCFG_INSTALL_LIBDIR=\\\"${LIBDIR}\\\" -DCFG_INSTALL_BINDIR=\\\"${BINDIR}\\\" -DCFG_INSTALL_SCRDIR=\\\"${TCL_LIBRARY}\\\" -DCFG_INSTALL_INCDIR=\\\"${INCLUDEDIR}\\\" -DCFG_INSTALL_DOCDIR=\\\"${MANDIR}\\\" -DCFG_RUNTIME_LIBDIR=\\\"${LIBDIR}\\\" -DCFG_RUNTIME_BINDIR=\\\"${BINDIR}\\\" -DCFG_RUNTIME_SCRDIR=\\\"${TCL_LIBRARY}\\\" -DCFG_RUNTIME_INCDIR=\\\"${INCLUDEDIR}\\\" -DCFG_RUNTIME_DOCDIR=\\\"${MANDIR}\\\""; }; };
+		F96D45B308F272BC004A47F5 /* tclPkgConfig.c in Sources */ = {isa = PBXBuildFile; fileRef = F96D3F1408F272A7004A47F5 /* tclPkgConfig.c */; settings = {COMPILER_FLAGS = "-DCFG_INSTALL_LIBDIR=\\\"$(LIBDIR)\\\" -DCFG_INSTALL_BINDIR=\\\"$(BINDIR)\\\" -DCFG_INSTALL_SCRDIR=\\\"$(TCL_LIBRARY)\\\" -DCFG_INSTALL_INCDIR=\\\"$(INCLUDEDIR)\\\" -DCFG_INSTALL_DOCDIR=\\\"$(MANDIR)\\\" -DCFG_RUNTIME_LIBDIR=\\\"$(LIBDIR)\\\" -DCFG_RUNTIME_BINDIR=\\\"$(BINDIR)\\\" -DCFG_RUNTIME_SCRDIR=\\\"$(TCL_LIBRARY)\\\" -DCFG_RUNTIME_INCDIR=\\\"$(INCLUDEDIR)\\\" -DCFG_RUNTIME_DOCDIR=\\\"$(MANDIR)\\\""; }; };
 		F96D45B608F272BC004A47F5 /* tclPosixStr.c in Sources */ = {isa = PBXBuildFile; fileRef = F96D3F1708F272A7004A47F5 /* tclPosixStr.c */; };
 		F96D45B708F272BC004A47F5 /* tclPreserve.c in Sources */ = {isa = PBXBuildFile; fileRef = F96D3F1808F272A7004A47F5 /* tclPreserve.c */; };
 		F96D45B808F272BC004A47F5 /* tclProc.c in Sources */ = {isa = PBXBuildFile; fileRef = F96D3F1908F272A7004A47F5 /* tclProc.c */; };
@@ -218,14 +218,10 @@
 		F96D45C308F272BC004A47F5 /* tclStrToD.c in Sources */ = {isa = PBXBuildFile; fileRef = F96D3F2408F272A7004A47F5 /* tclStrToD.c */; };
 		F96D45C408F272BC004A47F5 /* tclStubInit.c in Sources */ = {isa = PBXBuildFile; fileRef = F96D3F2508F272A7004A47F5 /* tclStubInit.c */; };
 		F96D45C508F272BC004A47F5 /* tclStubLib.c in Sources */ = {isa = PBXBuildFile; fileRef = F96D3F2608F272A7004A47F5 /* tclStubLib.c */; };
-		F96D45C608F272BC004A47F5 /* tclTest.c in Sources */ = {isa = PBXBuildFile; fileRef = F96D3F2708F272A7004A47F5 /* tclTest.c */; };
-		F96D45C708F272BC004A47F5 /* tclTestObj.c in Sources */ = {isa = PBXBuildFile; fileRef = F96D3F2808F272A7004A47F5 /* tclTestObj.c */; };
-		F96D45C808F272BC004A47F5 /* tclTestProcBodyObj.c in Sources */ = {isa = PBXBuildFile; fileRef = F96D3F2908F272A7004A47F5 /* tclTestProcBodyObj.c */; };
 		F96D45C908F272BC004A47F5 /* tclThread.c in Sources */ = {isa = PBXBuildFile; fileRef = F96D3F2A08F272A7004A47F5 /* tclThread.c */; };
 		F96D45CA08F272BC004A47F5 /* tclThreadAlloc.c in Sources */ = {isa = PBXBuildFile; fileRef = F96D3F2B08F272A7004A47F5 /* tclThreadAlloc.c */; };
 		F96D45CB08F272BC004A47F5 /* tclThreadJoin.c in Sources */ = {isa = PBXBuildFile; fileRef = F96D3F2C08F272A7004A47F5 /* tclThreadJoin.c */; };
 		F96D45CC08F272BC004A47F5 /* tclThreadStorage.c in Sources */ = {isa = PBXBuildFile; fileRef = F96D3F2D08F272A7004A47F5 /* tclThreadStorage.c */; };
-		F96D45CD08F272BC004A47F5 /* tclThreadTest.c in Sources */ = {isa = PBXBuildFile; fileRef = F96D3F2E08F272A7004A47F5 /* tclThreadTest.c */; };
 		F96D45CE08F272BC004A47F5 /* tclTimer.c in Sources */ = {isa = PBXBuildFile; fileRef = F96D3F2F08F272A7004A47F5 /* tclTimer.c */; };
 		F96D45D008F272BC004A47F5 /* tclTomMathInterface.c in Sources */ = {isa = PBXBuildFile; fileRef = F96D3F3108F272A7004A47F5 /* tclTomMathInterface.c */; };
 		F96D45D108F272BC004A47F5 /* tclTrace.c in Sources */ = {isa = PBXBuildFile; fileRef = F96D3F3208F272A7004A47F5 /* tclTrace.c */; };
@@ -290,11 +286,10 @@
 		F96D4ACB08F272C9004A47F5 /* tclUnixEvent.c in Sources */ = {isa = PBXBuildFile; fileRef = F96D446008F272B9004A47F5 /* tclUnixEvent.c */; };
 		F96D4ACC08F272C9004A47F5 /* tclUnixFCmd.c in Sources */ = {isa = PBXBuildFile; fileRef = F96D446108F272B9004A47F5 /* tclUnixFCmd.c */; };
 		F96D4ACD08F272C9004A47F5 /* tclUnixFile.c in Sources */ = {isa = PBXBuildFile; fileRef = F96D446208F272B9004A47F5 /* tclUnixFile.c */; };
-		F96D4ACE08F272C9004A47F5 /* tclUnixInit.c in Sources */ = {isa = PBXBuildFile; fileRef = F96D446308F272B9004A47F5 /* tclUnixInit.c */; settings = {COMPILER_FLAGS = "-DTCL_LIBRARY=\\\"${TCL_LIBRARY}\\\" -DTCL_PACKAGE_PATH=\\\"${TCL_PACKAGE_PATH}\\\""; }; };
+		F96D4ACE08F272C9004A47F5 /* tclUnixInit.c in Sources */ = {isa = PBXBuildFile; fileRef = F96D446308F272B9004A47F5 /* tclUnixInit.c */; settings = {COMPILER_FLAGS = "-DTCL_LIBRARY=\\\"$(TCL_LIBRARY)\\\" -DTCL_PACKAGE_PATH=\\\"$(TCL_PACKAGE_PATH)\\\""; }; };
 		F96D4ACF08F272C9004A47F5 /* tclUnixNotfy.c in Sources */ = {isa = PBXBuildFile; fileRef = F96D446408F272B9004A47F5 /* tclUnixNotfy.c */; };
 		F96D4AD008F272C9004A47F5 /* tclUnixPipe.c in Sources */ = {isa = PBXBuildFile; fileRef = F96D446508F272B9004A47F5 /* tclUnixPipe.c */; };
 		F96D4AD208F272CA004A47F5 /* tclUnixSock.c in Sources */ = {isa = PBXBuildFile; fileRef = F96D446708F272B9004A47F5 /* tclUnixSock.c */; };
-		F96D4AD308F272CA004A47F5 /* tclUnixTest.c in Sources */ = {isa = PBXBuildFile; fileRef = F96D446808F272B9004A47F5 /* tclUnixTest.c */; };
 		F96D4AD408F272CA004A47F5 /* tclUnixThrd.c in Sources */ = {isa = PBXBuildFile; fileRef = F96D446908F272B9004A47F5 /* tclUnixThrd.c */; };
 		F96D4AD608F272CA004A47F5 /* tclUnixTime.c in Sources */ = {isa = PBXBuildFile; fileRef = F96D446B08F272B9004A47F5 /* tclUnixTime.c */; };
 		F9E61D28090A481F002B3151 /* bn_mp_cmp_d.c in Sources */ = {isa = PBXBuildFile; fileRef = F96D427108F272B3004A47F5 /* bn_mp_cmp_d.c */; };
@@ -1753,11 +1748,14 @@
 		F96D449808F272BA004A47F5 /* tclWinThrd.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tclWinThrd.c; sourceTree = "<group>"; };
 		F96D449908F272BA004A47F5 /* tclWinThrd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tclWinThrd.h; sourceTree = "<group>"; };
 		F96D449A08F272BA004A47F5 /* tclWinTime.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tclWinTime.c; sourceTree = "<group>"; };
+		F97AE7F10B65C1E900310EA2 /* Wish-Common.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "Wish-Common.xcconfig"; sourceTree = "<group>"; };
+		F97AE82B0B65C69B00310EA2 /* Wish-Release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "Wish-Release.xcconfig"; sourceTree = "<group>"; };
+		F97AE8330B65C87F00310EA2 /* Wish-Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "Wish-Debug.xcconfig"; sourceTree = "<group>"; };
 		F9903CAF094FAADA004613E9 /* tclTomMath.decls */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = tclTomMath.decls; sourceTree = "<group>"; };
 		F9903CB0094FAADA004613E9 /* tclTomMathDecls.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tclTomMathDecls.h; sourceTree = "<group>"; };
-		F9A3082D08F2D4AB00BAE1AB /* Tk.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Tk.framework; path = ../Tk.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		F9A3084B08F2D4CE00BAE1AB /* Wish.app */ = {isa = PBXFileReference; lastKnownFileType = wrapper.application; name = Wish.app; path = ../Wish.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		F9A3084E08F2D4F400BAE1AB /* Tcl.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Tcl.framework; path = ../Tcl.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		F9A3082D08F2D4AB00BAE1AB /* Tk.framework */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.framework; path = Tk.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		F9A3084B08F2D4CE00BAE1AB /* Wish.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Wish.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		F9A3084E08F2D4F400BAE1AB /* Tcl.framework */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.framework; path = Tcl.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		F9ECB1120B26521500A28025 /* pkgIndex.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = pkgIndex.tcl; sourceTree = "<group>"; };
 		F9ECB1130B26521500A28025 /* platform.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = platform.tcl; sourceTree = "<group>"; };
 		F9ECB1140B26521500A28025 /* shell.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = shell.tcl; sourceTree = "<group>"; };
@@ -1797,11 +1795,12 @@
 		1AB674ADFE9D54B511CA2CBB /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				8DD76FB20486AB0100D96B5E /* tktest */,
 				F9A3084B08F2D4CE00BAE1AB /* Wish.app */,
+				8DD76FB20486AB0100D96B5E /* tktest */,
 				F9A3082D08F2D4AB00BAE1AB /* Tk.framework */,
 				F9A3084E08F2D4F400BAE1AB /* Tcl.framework */,
 			);
+			includeInIndex = 0;
 			name = Products;
 			sourceTree = "<group>";
 		};
@@ -2271,8 +2270,11 @@
 				F966BBF408F27A3C005CB29B /* tkMacOSXXCursors.r */,
 				F966BBF508F27A3C005CB29B /* tkMacOSXXStubs.c */,
 				F96888840AF78938000797B5 /* ttkMacOSXTheme.c */,
-				F966BBF708F27A3C005CB29B /* Wish-Info.plist.in */,
 				F966BBF808F27A3C005CB29B /* Wish.icns */,
+				F966BBF708F27A3C005CB29B /* Wish-Info.plist.in */,
+				F97AE7F10B65C1E900310EA2 /* Wish-Common.xcconfig */,
+				F97AE8330B65C87F00310EA2 /* Wish-Debug.xcconfig */,
+				F97AE82B0B65C69B00310EA2 /* Wish-Release.xcconfig */,
 			);
 			path = macosx;
 			sourceTree = "<group>";
@@ -3539,23 +3541,6 @@
 		};
 /* End PBXGroup section */
 
-/* Begin PBXLegacyTarget section */
-		F9E61D16090A3E94002B3151 /* Tk */ = {
-			isa = PBXLegacyTarget;
-			buildArgumentsString = "-c 'cd \"${TK_SRCROOT}/macosx\"  && a=`echo $0 | sed -e s/clean/distclean/ -e \\'s/..\\*/\\&-/\\'` && CFLAGS=\"${CFLAGS}\" gnumake $a\"\"${MAKE_TARGET} INSTALL_ROOT=\"${DSTROOT}\" INSTALL_PATH=\"${INSTALL_PATH}\" PREFIX=\"${PREFIX}\" BINDIR=\"${BINDIR}\" MANDIR=\"${MANDIR}\" TCL_BUILD_DIR=\"${TCL_BUILD_DIR}\" APPLICATION_INSTALL_PATH=\"${APPLICATION_INSTALL_PATH}\" $EXTRA_MAKE_FLAGS ${ALL_SETTINGS}' ${ACTION} \"\"";
-			buildConfigurationList = F95CC8AB09158F3100EA5ACE /* Build configuration list for PBXLegacyTarget "Tk" */;
-			buildPhases = (
-			);
-			buildToolPath = /bin/bash;
-			buildWorkingDirectory = "${SRCROOT}";
-			dependencies = (
-			);
-			name = Tk;
-			passBuildSettingsInEnvironment = 0;
-			productName = Tk;
-		};
-/* End PBXLegacyTarget section */
-
 /* Begin PBXNativeTarget section */
 		8DD76FA90486AB0100D96B5E /* tktest */ = {
 			isa = PBXNativeTarget;
@@ -3573,11 +3558,26 @@
 			dependencies = (
 			);
 			name = tktest;
-			productInstallPath = "${BINDIR}";
+			productInstallPath = "$(BINDIR)";
 			productName = tktest;
 			productReference = 8DD76FB20486AB0100D96B5E /* tktest */;
 			productType = "com.apple.product-type.tool";
 		};
+		F9E61D16090A3E94002B3151 /* Tk */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = F95CC8AB09158F3100EA5ACE /* Build configuration list for PBXNativeTarget "Tk" */;
+			buildPhases = (
+				F97AF02F0B665DA900310EA2 /* ShellScript */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = Tk;
+			productName = Wish;
+			productReference = F9A3084B08F2D4CE00BAE1AB /* Wish.app */;
+			productType = "com.apple.product-type.application";
+		};
 /* End PBXNativeTarget section */
 
 /* Begin PBXProject section */
@@ -3617,30 +3617,43 @@
 			files = (
 			);
 			inputPaths = (
-				"${TARGET_BUILD_DIR}/${PRODUCT_NAME}",
-				"${REZ_COLLECTOR_DIR}/${PRODUCT_NAME}.rsrc",
+				"$(TARGET_BUILD_DIR)/$(PRODUCT_NAME)",
+				"$(REZ_COLLECTOR_DIR)/$(PRODUCT_NAME).rsrc",
 			);
 			outputPaths = (
-				"${TARGET_TEMP_DIR}/stamp",
+				"$(TARGET_TEMP_DIR)/stamp",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/bash;
 			shellScript = "touch -t $(date -r $(expr $(date '+%s') + 5) '+%Y%m%d%H%M.%S') \"${TARGET_TEMP_DIR}/stamp\"\n\n## Xcode bug workaround: Rezzing does not take place for commandline tool targets\n## even when a ResourceManager Resources phase is present, but this script phase's\n## input dependency on the final merged resource file forces the Rezzing.\n\nif [ \"${ZERO_LINK}\" = \"YES\" ]; then\n    ## ZeroLinking ignores OTHER_LDFLAGS, so our resource file doesn't get linked into the executable.\n    ## workaround: copy resource data into resource fork of zerolink launcher (will only work on HFS+).\n    cp -f \"${SCRIPT_INPUT_FILE_1}\" \"${SCRIPT_INPUT_FILE_0}/..namedfork/rsrc\"\nfi\n";
 		};
+		F97AF02F0B665DA900310EA2 /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/bash;
+			shellScript = "gnumake -C \"${TK_SRCROOT}/macosx\"  -j \"$(sysctl -n hw.activecpu)\" \"$(echo \"${ACTION}\" | sed -e s/build// -e s/clean/distclean/ -e s/..\\*/\\&-/)${MAKE_TARGET}\" CFLAGS_WARNING=\"${WARNING_CFLAGS}\" SYMROOT=\"${BUILT_PRODUCTS_DIR}\" OBJ_DIR=\"${OBJECT_FILE_DIR}\" INSTALL_ROOT=\"${DSTROOT}\" PREFIX=\"${PREFIX}\" BINDIR=\"${BINDIR}\" LIBDIR=\"${FRAMEWORK_INSTALL_PATH}\" MANDIR=\"${MANDIR}\" EXTRA_CONFIGURE_ARGS=\"${CONFIGURE_ARGS}\" APPLICATION_INSTALL_PATH=\"${APPLICATION_INSTALL_PATH}\" TCL_BUILD_DIR=\"${TCL_BUILD_DIR}\" TCL_FRAMEWORK_DIR=\"${TCL_FRAMEWORK_DIR}\" ${EXTRA_MAKE_FLAGS}\nresult=$?\nif [ -e \"${BUILT_PRODUCTS_DIR}/tktest\" ]; then\n\trm -f \"${BUILT_PRODUCTS_DIR}/tktest\"\nfi\necho \"Done\"\nexit ${result}\n";
+		};
 		F9A5C5F508F651A2008AE941 /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
-				"${TCL_SRCROOT}/macosx/configure.ac",
-				"${TCL_SRCROOT}/unix/configure.in",
-				"${TCL_SRCROOT}/unix/tcl.m4",
-				"${TCL_SRCROOT}/unix/aclocal.m4",
-				"${TCL_SRCROOT}/unix/tclConfig.sh.in",
+				"$(TCL_SRCROOT)/macosx/configure.ac",
+				"$(TCL_SRCROOT)/unix/configure.in",
+				"$(TCL_SRCROOT)/unix/tcl.m4",
+				"$(TCL_SRCROOT)/unix/aclocal.m4",
+				"$(TCL_SRCROOT)/unix/tclConfig.sh.in",
 			);
 			outputPaths = (
-				"${DERIVED_FILE_DIR}/tcl/tclConfig.sh",
+				"$(DERIVED_FILE_DIR)/tcl/tclConfig.sh",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/bash;
@@ -3652,14 +3665,14 @@
 			files = (
 			);
 			inputPaths = (
-				"${TK_SRCROOT}/macosx/configure.ac",
-				"${TK_SRCROOT}/unix/configure.in",
-				"${TK_SRCROOT}/unix/tcl.m4",
-				"${TK_SRCROOT}/unix/aclocal.m4",
-				"${TK_SRCROOT}/unix/tkConfig.sh.in",
+				"$(TK_SRCROOT)/macosx/configure.ac",
+				"$(TK_SRCROOT)/unix/configure.in",
+				"$(TK_SRCROOT)/unix/tcl.m4",
+				"$(TK_SRCROOT)/unix/aclocal.m4",
+				"$(TK_SRCROOT)/unix/tkConfig.sh.in",
 			);
 			outputPaths = (
-				"${DERIVED_FILE_DIR}/tk/tkConfig.sh",
+				"$(DERIVED_FILE_DIR)/tk/tkConfig.sh",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/bash;
@@ -3734,14 +3747,10 @@
 				F96D45C308F272BC004A47F5 /* tclStrToD.c in Sources */,
 				F96D45C408F272BC004A47F5 /* tclStubInit.c in Sources */,
 				F96D45C508F272BC004A47F5 /* tclStubLib.c in Sources */,
-				F96D45C608F272BC004A47F5 /* tclTest.c in Sources */,
-				F96D45C708F272BC004A47F5 /* tclTestObj.c in Sources */,
-				F96D45C808F272BC004A47F5 /* tclTestProcBodyObj.c in Sources */,
 				F96D45C908F272BC004A47F5 /* tclThread.c in Sources */,
 				F96D45CA08F272BC004A47F5 /* tclThreadAlloc.c in Sources */,
 				F96D45CB08F272BC004A47F5 /* tclThreadJoin.c in Sources */,
 				F96D45CC08F272BC004A47F5 /* tclThreadStorage.c in Sources */,
-				F96D45CD08F272BC004A47F5 /* tclThreadTest.c in Sources */,
 				F96D45CE08F272BC004A47F5 /* tclTimer.c in Sources */,
 				F96D45D008F272BC004A47F5 /* tclTomMathInterface.c in Sources */,
 				F96D45D108F272BC004A47F5 /* tclTrace.c in Sources */,
@@ -3822,7 +3831,6 @@
 				F96D4ACF08F272C9004A47F5 /* tclUnixNotfy.c in Sources */,
 				F96D4AD008F272C9004A47F5 /* tclUnixPipe.c in Sources */,
 				F96D4AD208F272CA004A47F5 /* tclUnixSock.c in Sources */,
-				F96D4AD308F272CA004A47F5 /* tclUnixTest.c in Sources */,
 				F96D4AD408F272CA004A47F5 /* tclUnixThrd.c in Sources */,
 				F96D4AD608F272CA004A47F5 /* tclUnixTime.c in Sources */,
 				F966BDCF08F27A3F005CB29B /* tk3d.c in Sources */,
@@ -3980,228 +3988,61 @@
 		F91BCC4F093152310042A6BF /* ReleaseUniversal */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				APPLICATION_INSTALL_PATH = /Applications/Utilities;
-				BINDIR = "${PREFIX}/bin";
-				BUILD_STYLE = Deployment;
-				CFLAGS = "-Wno-deprecated-declarations ${CFLAGS}";
-				INSTALL_PATH = /Library/Frameworks;
-				MAKE_TARGET = deploy;
-				MANDIR = "${PREFIX}/man";
-				PREFIX = /usr/local;
-				PRODUCT_NAME = Tk;
-				TCL_BUILD_DIR = "${SYMROOT}/../tcl/${BUILD_STYLE}";
-				TCL_SRCROOT = "${SRCROOT}/../../tcl";
-				TK_SRCROOT = "${SRCROOT}/../../tk";
+				PRODUCT_NAME = Wish;
 			};
 			name = ReleaseUniversal;
 		};
 		F91BCC50093152310042A6BF /* ReleaseUniversal */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = (
-					ppc,
-					i386,
-				);
-				BINDIR = "${PREFIX}/bin";
-				CONFIGURE_ARGS = "--enable-threads ${CONFIGURE_ARGS}";
-				DEAD_CODE_STRIPPING = NO;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				DEPLOYMENT_POSTPROCESSING = YES;
-				GCC_DEBUGGING_SYMBOLS = full;
-				GCC_DYNAMIC_NO_PIC = YES;
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-				GCC_MODEL_TUNING = "";
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_OPTIMIZATION_LEVEL = s;
-				GCC_PREFIX_HEADER = "${DERIVED_FILE_DIR}/tk/tkConfig.h";
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					HAVE_TK_CONFIG_H,
-					TCL_NO_DEPRECATED,
-					HAVE_TCL_CONFIG_H,
-					"${GCC_PREPROCESSOR_DEFINITIONS}",
-				);
-				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
-				HEADER_SEARCH_PATHS = (
-					"${TK_SRCROOT}/generic",
-					"${TK_SRCROOT}/xlib",
-					"${DERIVED_FILE_DIR}/tcl",
-					"${DERIVED_FILE_DIR}/tk",
-				);
-				INCLUDEDIR = "${PREFIX}/include";
-				INSTALL_PATH = "${BINDIR}";
-				LIBDIR = "${PREFIX}/lib";
-				MANDIR = "${PREFIX}/man";
-				OTHER_CFLAGS = (
-					"-imacros",
-					"${DERIVED_FILE_DIR}/tcl/tclConfig.h",
-				);
-				OTHER_LDFLAGS = (
-					"-headerpad_max_install_names",
-					"-sectcreate",
-					__TEXT,
-					__tk_rsrc,
-					"${REZ_COLLECTOR_DIR}/${PRODUCT_NAME}.rsrc",
-				);
-				PER_ARCH_CFLAGS_ppc = "-mcpu=G3 -mtune=G4";
-				PREBINDING = NO;
-				PREFIX = /usr/local;
 				PRODUCT_NAME = tktest;
-				REZ_RESOURCE_MAP_READ_ONLY = YES;
-				REZ_SEARCH_PATHS = (
-					"${TK_SRCROOT}/generic",
-					"${TCL_SRCROOT}/generic",
-				);
-				SEPARATE_STRIP = YES;
-				TCL_LIBRARY = "${LIBDIR}/tcl${VERSION}";
-				TCL_PACKAGE_PATH = "\"${LIBDIR}\"";
-				TCL_SRCROOT = "${SRCROOT}/../../tcl";
-				TK_LIBRARY = "${LIBDIR}/tk${VERSION}";
-				TK_SRCROOT = "${SRCROOT}/../../tk";
-				VERSION = 8.5;
-				WARNING_CFLAGS = (
-					"-Wall",
-					"-Wno-implicit-int",
-					"-Wextra",
-					"-Wno-unused-parameter",
-					"-Wno-missing-field-initializers",
-				);
-				ZERO_LINK = NO;
 			};
 			name = ReleaseUniversal;
 		};
 		F91BCC51093152310042A6BF /* ReleaseUniversal */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = F97AE82B0B65C69B00310EA2 /* Wish-Release.xcconfig */;
 			buildSettings = {
-				CFLAGS = "-arch ppc -arch i386 -isysroot ${SDKROOT} -mmacosx-version-min=10.4";
-				CONFIGURE_ARGS = "--disable-symbols";
-				GCC_PREPROCESSOR_DEFINITIONS = NDEBUG;
+				ARCHS = (
+					ppc,
+					i386,
+				);
+				CFLAGS = "-arch ppc -arch i386 $(CFLAGS)";
 				MACOSX_DEPLOYMENT_TARGET = 10.4;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+				PREBINDING = NO;
 			};
 			name = ReleaseUniversal;
 		};
 		F95CC8AC09158F3100EA5ACE /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				APPLICATION_INSTALL_PATH = /Applications/Utilities;
-				BINDIR = "${PREFIX}/bin";
-				BUILD_STYLE = Development;
-				CFLAGS = "-Wno-deprecated-declarations ${CFLAGS}";
-				INSTALL_PATH = /Library/Frameworks;
-				MAKE_TARGET = develop;
-				MANDIR = "${PREFIX}/man";
-				PREFIX = /usr/local;
-				PRODUCT_NAME = Tk;
-				TCL_BUILD_DIR = "${SYMROOT}/../tcl/${BUILD_STYLE}";
-				TCL_SRCROOT = "${SRCROOT}/../../tcl";
-				TK_SRCROOT = "${SRCROOT}/../../tk";
+				PRODUCT_NAME = Wish;
 			};
 			name = Debug;
 		};
 		F95CC8AD09158F3100EA5ACE /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				APPLICATION_INSTALL_PATH = /Applications/Utilities;
-				BINDIR = "${PREFIX}/bin";
-				BUILD_STYLE = Deployment;
-				CFLAGS = "-Wno-deprecated-declarations ${CFLAGS}";
-				INSTALL_PATH = /Library/Frameworks;
-				MAKE_TARGET = deploy;
-				MANDIR = "${PREFIX}/man";
-				PREFIX = /usr/local;
-				PRODUCT_NAME = Tk;
-				TCL_BUILD_DIR = "${SYMROOT}/../tcl/${BUILD_STYLE}";
-				TCL_SRCROOT = "${SRCROOT}/../../tcl";
-				TK_SRCROOT = "${SRCROOT}/../../tk";
+				PRODUCT_NAME = Wish;
 			};
 			name = Release;
 		};
 		F95CC8AE09158F3100EA5ACE /* DebugNoFixZL */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				APPLICATION_INSTALL_PATH = /Applications/Utilities;
-				BINDIR = "${PREFIX}/bin";
-				BUILD_STYLE = Development;
-				CFLAGS = "-Wno-deprecated-declarations ${CFLAGS}";
-				INSTALL_PATH = /Library/Frameworks;
-				MAKE_TARGET = develop;
-				MANDIR = "${PREFIX}/man";
-				PREFIX = /usr/local;
-				PRODUCT_NAME = Tk;
-				TCL_BUILD_DIR = "${SYMROOT}/../tcl/${BUILD_STYLE}";
-				TCL_SRCROOT = "${SRCROOT}/../../tcl";
-				TK_SRCROOT = "${SRCROOT}/../../tk";
+				PRODUCT_NAME = Wish;
 			};
 			name = DebugNoFixZL;
 		};
 		F95CC8B109158F3100EA5ACE /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				BINDIR = "${PREFIX}/bin";
-				CONFIGURE_ARGS = "--enable-threads ${CONFIGURE_ARGS}";
-				DEAD_CODE_STRIPPING = NO;
-				DEBUG_INFORMATION_FORMAT = dwarf;
-				DEPLOYMENT_POSTPROCESSING = NO;
-				GCC_DEBUGGING_SYMBOLS = default;
-				GCC_DYNAMIC_NO_PIC = YES;
 				GCC_ENABLE_FIX_AND_CONTINUE = YES;
-				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-				GCC_MODEL_TUNING = "";
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREFIX_HEADER = "${DERIVED_FILE_DIR}/tk/tkConfig.h";
 				GCC_PREPROCESSOR_DEFINITIONS = (
-					HAVE_TK_CONFIG_H,
-					TCL_NO_DEPRECATED,
-					HAVE_TCL_CONFIG_H,
-					"${GCC_PREPROCESSOR_DEFINITIONS}",
-				);
-				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
-				HEADER_SEARCH_PATHS = (
-					"${TK_SRCROOT}/generic",
-					"${TK_SRCROOT}/xlib",
-					"${DERIVED_FILE_DIR}/tcl",
-					"${DERIVED_FILE_DIR}/tk",
-				);
-				INCLUDEDIR = "${PREFIX}/include";
-				INSTALL_PATH = "${BINDIR}";
-				LIBDIR = "${PREFIX}/lib";
-				MANDIR = "${PREFIX}/man";
-				OTHER_CFLAGS = (
-					"-imacros",
-					"${DERIVED_FILE_DIR}/tcl/tclConfig.h",
-				);
-				OTHER_LDFLAGS = (
-					"-headerpad_max_install_names",
-					"-sectcreate",
-					__TEXT,
-					__tk_rsrc,
-					"${REZ_COLLECTOR_DIR}/${PRODUCT_NAME}.rsrc",
+					"__private_extern__=extern",
+					"$(GCC_PREPROCESSOR_DEFINITIONS)",
 				);
-				PER_ARCH_CFLAGS_ppc = "-mcpu=G3 -mtune=G4";
-				PREBINDING = NO;
-				PREFIX = /usr/local;
 				PRODUCT_NAME = tktest;
-				REZ_RESOURCE_MAP_READ_ONLY = YES;
-				REZ_SEARCH_PATHS = (
-					"${TK_SRCROOT}/generic",
-					"${TCL_SRCROOT}/generic",
-				);
-				SEPARATE_STRIP = YES;
-				TCL_LIBRARY = "${LIBDIR}/tcl${VERSION}";
-				TCL_PACKAGE_PATH = "\"${LIBDIR}\"";
-				TCL_SRCROOT = "${SRCROOT}/../../tcl";
-				TK_LIBRARY = "${LIBDIR}/tk${VERSION}";
-				TK_SRCROOT = "${SRCROOT}/../../tk";
-				VERSION = 8.5;
-				WARNING_CFLAGS = (
-					"-Wall",
-					"-Wno-implicit-int",
-					"-Wextra",
-					"-Wno-unused-parameter",
-					"-Wno-missing-field-initializers",
-				);
 				ZERO_LINK = YES;
 			};
 			name = Debug;
@@ -4209,185 +4050,149 @@
 		F95CC8B209158F3100EA5ACE /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				BINDIR = "${PREFIX}/bin";
-				CONFIGURE_ARGS = "--enable-threads ${CONFIGURE_ARGS}";
-				DEAD_CODE_STRIPPING = NO;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				DEPLOYMENT_POSTPROCESSING = YES;
-				GCC_DEBUGGING_SYMBOLS = full;
-				GCC_DYNAMIC_NO_PIC = YES;
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-				GCC_MODEL_TUNING = "";
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_OPTIMIZATION_LEVEL = s;
-				GCC_PREFIX_HEADER = "${DERIVED_FILE_DIR}/tk/tkConfig.h";
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					HAVE_TK_CONFIG_H,
-					TCL_NO_DEPRECATED,
-					HAVE_TCL_CONFIG_H,
-					"${GCC_PREPROCESSOR_DEFINITIONS}",
-				);
-				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
-				HEADER_SEARCH_PATHS = (
-					"${TK_SRCROOT}/generic",
-					"${TK_SRCROOT}/xlib",
-					"${DERIVED_FILE_DIR}/tcl",
-					"${DERIVED_FILE_DIR}/tk",
-				);
-				INCLUDEDIR = "${PREFIX}/include";
-				INSTALL_PATH = "${BINDIR}";
-				LIBDIR = "${PREFIX}/lib";
-				MANDIR = "${PREFIX}/man";
-				OTHER_CFLAGS = (
-					"-imacros",
-					"${DERIVED_FILE_DIR}/tcl/tclConfig.h",
-				);
-				OTHER_LDFLAGS = (
-					"-headerpad_max_install_names",
-					"-sectcreate",
-					__TEXT,
-					__tk_rsrc,
-					"${REZ_COLLECTOR_DIR}/${PRODUCT_NAME}.rsrc",
-				);
-				PER_ARCH_CFLAGS_ppc = "-mcpu=G3 -mtune=G4";
-				PREBINDING = NO;
-				PREFIX = /usr/local;
 				PRODUCT_NAME = tktest;
-				REZ_RESOURCE_MAP_READ_ONLY = YES;
-				REZ_SEARCH_PATHS = (
-					"${TK_SRCROOT}/generic",
-					"${TCL_SRCROOT}/generic",
-				);
-				SEPARATE_STRIP = YES;
-				TCL_LIBRARY = "${LIBDIR}/tcl${VERSION}";
-				TCL_PACKAGE_PATH = "\"${LIBDIR}\"";
-				TCL_SRCROOT = "${SRCROOT}/../../tcl";
-				TK_LIBRARY = "${LIBDIR}/tk${VERSION}";
-				TK_SRCROOT = "${SRCROOT}/../../tk";
-				VERSION = 8.5;
-				WARNING_CFLAGS = (
-					"-Wall",
-					"-Wno-implicit-int",
-					"-Wextra",
-					"-Wno-unused-parameter",
-					"-Wno-missing-field-initializers",
-				);
-				ZERO_LINK = NO;
 			};
 			name = Release;
 		};
 		F95CC8B309158F3100EA5ACE /* DebugNoFixZL */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				BINDIR = "${PREFIX}/bin";
-				CONFIGURE_ARGS = "--enable-threads ${CONFIGURE_ARGS}";
-				DEAD_CODE_STRIPPING = NO;
-				DEBUG_INFORMATION_FORMAT = dwarf;
-				DEPLOYMENT_POSTPROCESSING = NO;
-				GCC_DEBUGGING_SYMBOLS = default;
-				GCC_DYNAMIC_NO_PIC = YES;
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-				GCC_MODEL_TUNING = "";
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREFIX_HEADER = "${DERIVED_FILE_DIR}/tk/tkConfig.h";
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					HAVE_TK_CONFIG_H,
-					TCL_NO_DEPRECATED,
-					HAVE_TCL_CONFIG_H,
-					"${GCC_PREPROCESSOR_DEFINITIONS}",
-				);
-				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
-				HEADER_SEARCH_PATHS = (
-					"${TK_SRCROOT}/generic",
-					"${TK_SRCROOT}/xlib",
-					"${DERIVED_FILE_DIR}/tcl",
-					"${DERIVED_FILE_DIR}/tk",
-				);
-				INCLUDEDIR = "${PREFIX}/include";
-				INSTALL_PATH = "${BINDIR}";
-				LIBDIR = "${PREFIX}/lib";
-				MANDIR = "${PREFIX}/man";
-				OTHER_CFLAGS = (
-					"-imacros",
-					"${DERIVED_FILE_DIR}/tcl/tclConfig.h",
-				);
-				OTHER_LDFLAGS = (
-					"-headerpad_max_install_names",
-					"-sectcreate",
-					__TEXT,
-					__tk_rsrc,
-					"${REZ_COLLECTOR_DIR}/${PRODUCT_NAME}.rsrc",
-				);
-				PER_ARCH_CFLAGS_ppc = "-mcpu=G3 -mtune=G4";
-				PREBINDING = NO;
-				PREFIX = /usr/local;
 				PRODUCT_NAME = tktest;
-				REZ_RESOURCE_MAP_READ_ONLY = YES;
-				REZ_SEARCH_PATHS = (
-					"${TK_SRCROOT}/generic",
-					"${TCL_SRCROOT}/generic",
-				);
-				SEPARATE_STRIP = YES;
-				TCL_LIBRARY = "${LIBDIR}/tcl${VERSION}";
-				TCL_PACKAGE_PATH = "\"${LIBDIR}\"";
-				TCL_SRCROOT = "${SRCROOT}/../../tcl";
-				TK_LIBRARY = "${LIBDIR}/tk${VERSION}";
-				TK_SRCROOT = "${SRCROOT}/../../tk";
-				VERSION = 8.5;
-				WARNING_CFLAGS = (
-					"-Wall",
-					"-Wno-implicit-int",
-					"-Wextra",
-					"-Wno-unused-parameter",
-					"-Wno-missing-field-initializers",
-				);
-				ZERO_LINK = NO;
 			};
 			name = DebugNoFixZL;
 		};
 		F95CC8B609158F3100EA5ACE /* Debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = F97AE8330B65C87F00310EA2 /* Wish-Debug.xcconfig */;
 			buildSettings = {
-				CONFIGURE_ARGS = "--enable-symbols";
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"__private_extern__=extern",
-					"DEBUG_ASSERT_PRODUCTION_CODE=0",
-				);
 				MACOSX_DEPLOYMENT_TARGET = 10.2;
+				PREBINDING = NO;
 			};
 			name = Debug;
 		};
 		F95CC8B709158F3100EA5ACE /* Release */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = F97AE82B0B65C69B00310EA2 /* Wish-Release.xcconfig */;
 			buildSettings = {
-				CONFIGURE_ARGS = "--disable-symbols";
-				GCC_PREPROCESSOR_DEFINITIONS = NDEBUG;
 				MACOSX_DEPLOYMENT_TARGET = 10.2;
+				PREBINDING = YES;
 			};
 			name = Release;
 		};
 		F95CC8B809158F3100EA5ACE /* DebugNoFixZL */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = F97AE8330B65C87F00310EA2 /* Wish-Debug.xcconfig */;
 			buildSettings = {
-				CONFIGURE_ARGS = "--enable-symbols";
-				GCC_PREPROCESSOR_DEFINITIONS = "DEBUG_ASSERT_PRODUCTION_CODE=0";
 				MACOSX_DEPLOYMENT_TARGET = 10.2;
+				PREBINDING = NO;
 			};
 			name = DebugNoFixZL;
 		};
+		F9DB62080B65ADA800A370FB /* ReleaseUniversal10.4uSDK */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = Wish;
+			};
+			name = ReleaseUniversal10.4uSDK;
+		};
+		F9DB62090B65ADA800A370FB /* ReleaseUniversal10.4uSDK */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = tktest;
+			};
+			name = ReleaseUniversal10.4uSDK;
+		};
+		F9DB620A0B65ADA800A370FB /* ReleaseUniversal10.4uSDK */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = F97AE82B0B65C69B00310EA2 /* Wish-Release.xcconfig */;
+			buildSettings = {
+				ARCHS = (
+					ppc,
+					i386,
+				);
+				CFLAGS = "-arch ppc -arch i386 $(CFLAGS)";
+				CPPFLAGS = "-isysroot $(SDKROOT) $(CPPFLAGS)";
+				MACOSX_DEPLOYMENT_TARGET = 10.4;
+				PREBINDING = NO;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+			};
+			name = ReleaseUniversal10.4uSDK;
+		};
+		F9DB621F0B65AFDE00A370FB /* ReleasePPC10.3.9SDK */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = Wish;
+			};
+			name = ReleasePPC10.3.9SDK;
+		};
+		F9DB62200B65AFDE00A370FB /* ReleasePPC10.3.9SDK */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = tktest;
+			};
+			name = ReleasePPC10.3.9SDK;
+		};
+		F9DB62210B65AFDE00A370FB /* ReleasePPC10.3.9SDK */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = F97AE82B0B65C69B00310EA2 /* Wish-Release.xcconfig */;
+			buildSettings = {
+				ARCHS = ppc;
+				CFLAGS = "$(PER_ARCH_CFLAGS_ppc) $(CFLAGS)";
+				CPPFLAGS = "-arch ppc -isysroot $(SDKROOT) $(CPPFLAGS)";
+				MACOSX_DEPLOYMENT_TARGET = 10.2;
+				PREBINDING = YES;
+				SDKROOT = /Developer/SDKs/MacOSX10.3.9.sdk;
+			};
+			name = ReleasePPC10.3.9SDK;
+		};
+		F9DB62350B65B03A00A370FB /* ReleasePPC10.2.8SDK */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = Wish;
+			};
+			name = ReleasePPC10.2.8SDK;
+		};
+		F9DB62360B65B03A00A370FB /* ReleasePPC10.2.8SDK */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = tktest;
+			};
+			name = ReleasePPC10.2.8SDK;
+		};
+		F9DB62370B65B03A00A370FB /* ReleasePPC10.2.8SDK */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = F97AE82B0B65C69B00310EA2 /* Wish-Release.xcconfig */;
+			buildSettings = {
+				ARCHS = ppc;
+				CC = "$(CC)-$(GCC_VERSION)";
+				CFLAGS = "$(PER_ARCH_CFLAGS_ppc) -fconstant-cfstrings $(CFLAGS)";
+				CPPFLAGS = "-arch ppc -D__CONSTANT_CFSTRINGS__ -DMAC_OS_X_VERSION_MIN_REQUIRED=1020 -nostdinc -isystem $(SDKROOT)/usr/include/gcc/darwin/$(GCC_VERSION) -isystem $(SDKROOT)/usr/include -F$(SDKROOT)/System/Library/Frameworks";
+				DEBUG_INFORMATION_FORMAT = stabs;
+				GCC_VERSION = 3.3;
+				LDFLAGS = "-L$(SDKROOT)/usr/lib/gcc/darwin/$(GCC_VERSION) -Wl,-syslibroot,$(SDKROOT)";
+				MACOSX_DEPLOYMENT_TARGET = 10.2;
+				PREBINDING = YES;
+				SDKROOT = /Developer/SDKs/MacOSX10.2.8.sdk;
+				WARNING_CFLAGS = (
+					"$(WARNING_CFLAGS_GCC3)",
+					"-Wno-long-double",
+				);
+			};
+			name = ReleasePPC10.2.8SDK;
+		};
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-		F95CC8AB09158F3100EA5ACE /* Build configuration list for PBXLegacyTarget "Tk" */ = {
+		F95CC8AB09158F3100EA5ACE /* Build configuration list for PBXNativeTarget "Tk" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				F95CC8AC09158F3100EA5ACE /* Debug */,
-				F95CC8AD09158F3100EA5ACE /* Release */,
 				F95CC8AE09158F3100EA5ACE /* DebugNoFixZL */,
+				F95CC8AD09158F3100EA5ACE /* Release */,
 				F91BCC4F093152310042A6BF /* ReleaseUniversal */,
+				F9DB62080B65ADA800A370FB /* ReleaseUniversal10.4uSDK */,
+				F9DB621F0B65AFDE00A370FB /* ReleasePPC10.3.9SDK */,
+				F9DB62350B65B03A00A370FB /* ReleasePPC10.2.8SDK */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Debug;
@@ -4396,9 +4201,12 @@
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				F95CC8B109158F3100EA5ACE /* Debug */,
-				F95CC8B209158F3100EA5ACE /* Release */,
 				F95CC8B309158F3100EA5ACE /* DebugNoFixZL */,
+				F95CC8B209158F3100EA5ACE /* Release */,
 				F91BCC50093152310042A6BF /* ReleaseUniversal */,
+				F9DB62090B65ADA800A370FB /* ReleaseUniversal10.4uSDK */,
+				F9DB62200B65AFDE00A370FB /* ReleasePPC10.3.9SDK */,
+				F9DB62360B65B03A00A370FB /* ReleasePPC10.2.8SDK */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Debug;
@@ -4407,9 +4215,12 @@
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				F95CC8B609158F3100EA5ACE /* Debug */,
-				F95CC8B709158F3100EA5ACE /* Release */,
 				F95CC8B809158F3100EA5ACE /* DebugNoFixZL */,
+				F95CC8B709158F3100EA5ACE /* Release */,
 				F91BCC51093152310042A6BF /* ReleaseUniversal */,
+				F9DB620A0B65ADA800A370FB /* ReleaseUniversal10.4uSDK */,
+				F9DB62210B65AFDE00A370FB /* ReleasePPC10.3.9SDK */,
+				F9DB62370B65B03A00A370FB /* ReleasePPC10.2.8SDK */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Debug;