diff options
Diffstat (limited to 'macosx')
| -rw-r--r-- | macosx/Wish-Common.xcconfig | 9 | ||||
| -rw-r--r-- | macosx/Wish.xcodeproj/default.pbxuser | 1 | ||||
| -rw-r--r-- | macosx/Wish.xcodeproj/project.pbxproj | 2 | ||||
| -rw-r--r-- | macosx/tkMacOSXDebug.c | 10 |
4 files changed, 15 insertions, 7 deletions
diff --git a/macosx/Wish-Common.xcconfig b/macosx/Wish-Common.xcconfig index 1500f88..08e041e 100644 --- a/macosx/Wish-Common.xcconfig +++ b/macosx/Wish-Common.xcconfig @@ -9,7 +9,7 @@ // 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 $ +// RCS: @(#) $Id: Wish-Common.xcconfig,v 1.2 2007/03/07 23:46:34 das Exp $ // HEADER_SEARCH_PATHS = $(TK_SRCROOT)/generic $(TK_SRCROOT)/xlib $(DERIVED_FILE_DIR)/tcl $(DERIVED_FILE_DIR)/tk $(HEADER_SEARCH_PATHS) @@ -21,8 +21,11 @@ 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) +GCC = /usr/bin/gcc +GCC_VERSION = 4.0 +CC = $(GCC)-$(GCC_VERSION) +WARNING_CFLAGS_GCC3 = -Wall -Wno-implicit-int -Wno-unused-parameter -Wno-deprecated-declarations +WARNING_CFLAGS = -Wextra -Wno-missing-field-initializers $(WARNING_CFLAGS_GCC3) $(WARNING_CFLAGS) REZ_RESOURCE_MAP_READ_ONLY = YES APPLICATION_INSTALL_PATH = /Applications/Utilities BINDIR = $(PREFIX)/bin diff --git a/macosx/Wish.xcodeproj/default.pbxuser b/macosx/Wish.xcodeproj/default.pbxuser index eb4e7cd..853eaaa 100644 --- a/macosx/Wish.xcodeproj/default.pbxuser +++ b/macosx/Wish.xcodeproj/default.pbxuser @@ -14,6 +14,7 @@ }; sourceControlManager = F944EB9C08F798180049FDD4 /* Source Control */; userBuildSettings = { + GCC = /usr/bin/gcc; SYMROOT = "${SRCROOT}/../../build/tk"; }; }; diff --git a/macosx/Wish.xcodeproj/project.pbxproj b/macosx/Wish.xcodeproj/project.pbxproj index 1f4be63..a0a4fbd 100644 --- a/macosx/Wish.xcodeproj/project.pbxproj +++ b/macosx/Wish.xcodeproj/project.pbxproj @@ -4121,6 +4121,7 @@ F9DB621F0B65AFDE00A370FB /* ReleasePPC10.3.9SDK */ = { isa = XCBuildConfiguration; buildSettings = { + LDFLAGS = "-force_cpusubtype_ALL $(LDFLAGS)"; PRODUCT_NAME = Wish; }; name = ReleasePPC10.3.9SDK; @@ -4164,7 +4165,6 @@ 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; diff --git a/macosx/tkMacOSXDebug.c b/macosx/tkMacOSXDebug.c index 4836a90..5537d1c 100644 --- a/macosx/tkMacOSXDebug.c +++ b/macosx/tkMacOSXDebug.c @@ -5,7 +5,7 @@ * regions, etc... * * Copyright 2001, Apple Computer, Inc. - * Copyright (c) 2006 Daniel A. Steffen <das@users.sourceforge.net> + * Copyright (c) 2006-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. @@ -54,7 +54,7 @@ * software in accordance with the terms specified in this * license. * - * RCS: @(#) $Id: tkMacOSXDebug.c,v 1.10 2006/10/31 22:33:34 das Exp $ + * RCS: @(#) $Id: tkMacOSXDebug.c,v 1.11 2007/03/07 23:46:34 das Exp $ */ #include "tkMacOSXInt.h" @@ -494,7 +494,11 @@ TkMacOSXGetNamedDebugSymbol(const char* module, const char* symbol) if (!addr) { const struct mach_header *mh = NULL; uint32_t i, n = _dyld_image_count(); + size_t module_len; + if (module && *module) { + module_len = strlen(module); + } for (i = 0; i < n; i++) { if (module && *module) { /* Find image with given module name */ @@ -505,7 +509,7 @@ TkMacOSXGetNamedDebugSymbol(const char* module, const char* symbol) continue; } name = strrchr(path, '/') + 1; - if (strncmp(name, module, strlen(name)) != 0) { + if (strncmp(name, module, module_len) != 0) { continue; } } |