* macosx/Wish.pbproj/project.pbxproj:

	* macosx/buildTkConfig.tcl: fixes for tclConfig.h changes.

	* macosx/Wish.pbproj/project.pbxproj: fixed references to renamed
	bitmap files.

	* macosx/Wish.xcode/project.pbxproj (new):
	* macosx/Wish.xcode/default.pbxuser (new):
	* macosx/Wish-Info.plist (new):
	* macosx/Tk-Info.plist (new): added new Xcode 1.5 project using
	native targets, made possible by tclConfig.h changes.

	* generic/tk.h: added version number change comments for new files.

1 files changed, 23 insertions, 26 deletions

diff --git a/macosx/Wish.pbproj/project.pbxproj b/macosx/Wish.pbproj/project.pbxproj
index c5bfafc..5b26acd 100644
--- a/macosx/Wish.pbproj/project.pbxproj
+++ b/macosx/Wish.pbproj/project.pbxproj
@@ -1874,12 +1874,11 @@
 				DYLIB_INSTALL_PATH = /Library/Frameworks;
 				FRAMEWORK_SEARCH_PATHS = "\"$(TCL_FRAMEWORK_DIR)\"";
 				FRAMEWORK_VERSION = 8.5;
-				GLOBAL_CFLAGS = "`source \"${TCL_FRAMEWORK_DIR}/Tcl.framework/tclConfig.sh\"; echo $${}{TCL_EXTRA_CFLAGS} $${}{TCL_DEFS} | sed -e 's|\\\\\\\\\\\\\\\"|\\\"|g' | sed -e 's| -DTCL_WIDE_INT_TYPE=long. long||'` -U_REENTRANT";
 				HEADER_SEARCH_PATHS = "\"$(TCL_FRAMEWORK_DIR)/Tcl.framework/Headers\" \"$(TCL_FRAMEWORK_DIR)/Tcl.framework/PrivateHeaders\" . ../bitmaps ../generic ../xlib";
 				INSTALL_PATH = "${DYLIB_INSTALL_PATH}";
 				LIBRARY_SEARCH_PATHS = "";
 				OPTIMIZATION_CFLAGS = "-O0";
-				OTHER_CFLAGS = "-DMAC_OSX_TK -DTCL_WIDE_INT_TYPE=\"long long\"";
+				OTHER_CFLAGS = "-DMAC_OSX_TK -DHAVE_TCL_CONFIG_H";
 				OTHER_LDFLAGS = "-seg1addr 0xb000000";
 				OTHER_LIBTOOL_FLAGS = "";
 				OTHER_REZFLAGS = "-i \"$(TCL_FRAMEWORK_DIR)/Tcl.framework/Headers\" -i \"../generic\"";
@@ -3109,80 +3108,80 @@ MacOS X Port by Jim Ingham <jingham@apple.com> & Ian Reid, Copyright Â
 		F5375689016C3F1001DC9062 = {
 			isa = PBXFileReference;
 			lastKnownFileType = image.bmp;
-			name = error.bmp;
-			path = ../bitmaps/error.bmp;
+			name = error.xbm;
+			path = ../bitmaps/error.xbm;
 			refType = 2;
 			sourceTree = SOURCE_ROOT;
 		};
 		F537568A016C3F1001DC9062 = {
 			isa = PBXFileReference;
 			lastKnownFileType = image.bmp;
-			name = gray12.bmp;
-			path = ../bitmaps/gray12.bmp;
+			name = gray12.xbm;
+			path = ../bitmaps/gray12.xbm;
 			refType = 2;
 			sourceTree = SOURCE_ROOT;
 		};
 		F537568B016C3F1001DC9062 = {
 			isa = PBXFileReference;
 			lastKnownFileType = image.bmp;
-			name = gray25.bmp;
-			path = ../bitmaps/gray25.bmp;
+			name = gray25.xbm;
+			path = ../bitmaps/gray25.xbm;
 			refType = 2;
 			sourceTree = SOURCE_ROOT;
 		};
 		F537568C016C3F1001DC9062 = {
 			isa = PBXFileReference;
 			lastKnownFileType = image.bmp;
-			name = gray50.bmp;
-			path = ../bitmaps/gray50.bmp;
+			name = gray50.xbm;
+			path = ../bitmaps/gray50.xbm;
 			refType = 2;
 			sourceTree = SOURCE_ROOT;
 		};
 		F537568D016C3F1001DC9062 = {
 			isa = PBXFileReference;
 			lastKnownFileType = image.bmp;
-			name = gray75.bmp;
-			path = ../bitmaps/gray75.bmp;
+			name = gray75.xbm;
+			path = ../bitmaps/gray75.xbm;
 			refType = 2;
 			sourceTree = SOURCE_ROOT;
 		};
 		F537568E016C3F1001DC9062 = {
 			isa = PBXFileReference;
 			lastKnownFileType = image.bmp;
-			name = hourglass.bmp;
-			path = ../bitmaps/hourglass.bmp;
+			name = hourglass.xbm;
+			path = ../bitmaps/hourglass.xbm;
 			refType = 2;
 			sourceTree = SOURCE_ROOT;
 		};
 		F537568F016C3F1001DC9062 = {
 			isa = PBXFileReference;
 			lastKnownFileType = image.bmp;
-			name = info.bmp;
-			path = ../bitmaps/info.bmp;
+			name = info.xbm;
+			path = ../bitmaps/info.xbm;
 			refType = 2;
 			sourceTree = SOURCE_ROOT;
 		};
 		F5375690016C3F1001DC9062 = {
 			isa = PBXFileReference;
 			lastKnownFileType = image.bmp;
-			name = questhead.bmp;
-			path = ../bitmaps/questhead.bmp;
+			name = questhead.xbm;
+			path = ../bitmaps/questhead.xbm;
 			refType = 2;
 			sourceTree = SOURCE_ROOT;
 		};
 		F5375691016C3F1001DC9062 = {
 			isa = PBXFileReference;
 			lastKnownFileType = image.bmp;
-			name = question.bmp;
-			path = ../bitmaps/question.bmp;
+			name = question.xbm;
+			path = ../bitmaps/question.xbm;
 			refType = 2;
 			sourceTree = SOURCE_ROOT;
 		};
 		F5375692016C3F1001DC9062 = {
 			isa = PBXFileReference;
 			lastKnownFileType = image.bmp;
-			name = warning.bmp;
-			path = ../bitmaps/warning.bmp;
+			name = warning.xbm;
+			path = ../bitmaps/warning.xbm;
 			refType = 2;
 			sourceTree = SOURCE_ROOT;
 		};
@@ -3277,12 +3276,11 @@ MacOS X Port by Jim Ingham <jingham@apple.com> & Ian Reid, Copyright Â
 				DYLIB_INSTALL_PATH = /Library/Frameworks;
 				FRAMEWORK_SEARCH_PATHS = "\"$(TCL_FRAMEWORK_DIR)\" \"$(SYMROOT)\"";
 				FRAMEWORK_VERSION = 8.5;
-				GLOBAL_CFLAGS = "`source \"${TCL_FRAMEWORK_DIR}/Tcl.framework/tclConfig.sh\"; echo $${}{TCL_EXTRA_CFLAGS} $${}{TCL_DEFS} | sed -e 's|\\\\\\\\\\\\\\\"|\\\"|g' | sed -e 's| -DTCL_WIDE_INT_TYPE=long. long||'` -U_REENTRANT";
 				HEADER_SEARCH_PATHS = "\"$(TCL_FRAMEWORK_DIR)/Tcl.framework/Headers\" \"$(TCL_FRAMEWORK_DIR)/Tcl.framework/PrivateHeaders\" . ../generic ../xlib";
 				INSTALL_PATH = "${APPLICATION_INSTALL_PATH}";
 				LIBRARY_SEARCH_PATHS = "";
 				OPTIMIZATION_CFLAGS = "-O0";
-				OTHER_CFLAGS = "-DMAC_OSX_TK -DTCL_WIDE_INT_TYPE=\"long long\"";
+				OTHER_CFLAGS = "-DMAC_OSX_TK -DHAVE_TCL_CONFIG_H";
 				OTHER_LDFLAGS = "-sectcreate __TEXT __info_plist \"$TEMP_DIR/Info.plist\" -headerpad_max_install_names";
 				OTHER_REZFLAGS = "-i \"$(TCL_FRAMEWORK_DIR)/Tcl.framework/Headers\" -i \"../generic\"";
 				PRODUCT_NAME = "Wish Shell";
@@ -3469,11 +3467,10 @@ MacOS X Port by Jim Ingham <jingham@apple.com> & Ian Reid, Copyright Â
 				F59D847903390D7E016F146B,
 			);
 			buildSettings = {
-				GLOBAL_CFLAGS = "`source \"${TCL_FRAMEWORK_DIR}/Tcl.framework/tclConfig.sh\"; echo $${}{TCL_EXTRA_CFLAGS} $${}{TCL_DEFS} | sed -e 's|\\\\\\\\\\\\\\\"|\\\"|g' | sed -e 's| -DTCL_WIDE_INT_TYPE=long. long||'` -U_REENTRANT";
 				HEADER_SEARCH_PATHS = "\"$(TCL_FRAMEWORK_DIR)/Tcl.framework/Headers\" \"$(TCL_FRAMEWORK_DIR)/Tcl.framework/PrivateHeaders\" . ../generic ../xlib";
 				LIBRARY_STYLE = STATIC;
 				OPTIMIZATION_CFLAGS = "-O0";
-				OTHER_CFLAGS = "-DMAC_OSX_TK -DTCL_WIDE_INT_TYPE=\"long long\"";
+				OTHER_CFLAGS = "-DMAC_OSX_TK -DHAVE_TCL_CONFIG_H";
 				OTHER_LDFLAGS = "";
 				OTHER_LIBTOOL_FLAGS = "";
 				PRODUCT_NAME = libtkstub8.5.a;