diff options
| author | das <das> | 2007-03-07 23:46:33 (GMT) |
|---|---|---|
| committer | das <das> | 2007-03-07 23:46:33 (GMT) |
| commit | 3288ca4931072f874190455b686106df2d756cbd (patch) | |
| tree | b327533aebd6e8b2b22cd04e1e847fddbe5de52d /macosx/Wish.xcodeproj | |
| parent | 377fc83bb085523c857545603b7cd054ef49f160 (diff) | |
| download | tk-3288ca4931072f874190455b686106df2d756cbd.zip tk-3288ca4931072f874190455b686106df2d756cbd.tar.gz tk-3288ca4931072f874190455b686106df2d756cbd.tar.bz2 | |
* generic/tkMain.c (Tk_MainEx): replicate macosx-specific code from
TkpInit() that ensures the console window appears when wish is started
from the OS X Finder (i.e. with stdin == /dev/null), jeffh's 2006-11-24
change rendered the corresponding code in TkpInit() ineffective in wish
because Tk_MainEx() sets tcl_interactive before calling TkpInit().
* generic/ttk/ttkGenStubs.tcl (new): add ttk-specific genstubs.tcl from
* unix/Makefile.in (genstubs): tile and run it from 'genstubs'
target, restores ability to generate all of Tk's stub sources.
* generic/ttk/ttkTreeview.c: #ifdef out unused declaration.
* macosx/tkMacOSXDebug.c (TkMacOSXGetNamedDebugSymbol): add fix for
libraries loaded with a DYLD_IMAGE_SUFFIX.
* macosx/Wish.xcodeproj/project.pbxproj: ensure gcc version used by
* macosx/Wish.xcodeproj/default.pbxuser: Xcode and configure/make are
* macosx/Wish-Common.xcconfig: consistent and independent of
gcc_select default and CC env var; fixes for Xcode 3.0.
* unix/tcl.m4 (Darwin): s/CFLAGS/CPPFLAGS/ in macosx-version-min check.
* unix/configure: autoconf-2.59
Diffstat (limited to 'macosx/Wish.xcodeproj')
| -rw-r--r-- | macosx/Wish.xcodeproj/default.pbxuser | 1 | ||||
| -rw-r--r-- | macosx/Wish.xcodeproj/project.pbxproj | 2 |
2 files changed, 2 insertions, 1 deletions
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; |