diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | generic/tkTextIndex.c | 3 | ||||
| -rw-r--r-- | macosx/Makefile | 9 | ||||
| -rw-r--r-- | macosx/Wish.pbproj/project.pbxproj | 7 |
4 files changed, 20 insertions, 10 deletions
@@ -1,3 +1,14 @@ +2003-01-27 Daniel Steffen <das@users.sourceforge.net> + + * generic/tkTextIndex.c: added '#include <tclInt.h>' since the + code uses the TclUtfToUniChar macro from that file. [Bug 874745] + + * macosx/Wish.pbproj/project.pbxproj: removed erroneous reference + to mkpsenc.tcl in bundle resources phase (mkpsenc.tcl is already + part of the copy files phase to Resources/Scripts). + + * macosx/Makefile: added support for 'xcodebuild' on Mac OS X 10.3. + 2004-01-25 Benjamin Riefenstahl <Benjamin.Riefenstahl@epost.de> * macosx/tkMacOSXKeyboard.c: Fix regressions due to the last diff --git a/generic/tkTextIndex.c b/generic/tkTextIndex.c index 85349c2..8588020 100644 --- a/generic/tkTextIndex.c +++ b/generic/tkTextIndex.c @@ -10,13 +10,14 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkTextIndex.c,v 1.15 2004/01/13 02:06:01 davygrvy Exp $ + * RCS: @(#) $Id: tkTextIndex.c,v 1.16 2004/01/27 10:09:35 das Exp $ */ #include "default.h" #include "tkPort.h" #include "tkInt.h" #include "tkText.h" +#include <tclInt.h> /* * Index to use to select last character in line (very large integer): diff --git a/macosx/Makefile b/macosx/Makefile index 82d50b5..f10e7ba 100644 --- a/macosx/Makefile +++ b/macosx/Makefile @@ -3,7 +3,7 @@ # Makefile to build AquaTk on Mac OS X packaged as a Framework # uses Project Builder command line tool 'pbxbuild' # -# RCS: @(#) $Id: Makefile,v 1.11 2003/10/01 14:35:32 das Exp $ +# RCS: @(#) $Id: Makefile,v 1.12 2004/01/27 10:09:37 das Exp $ # ################################################################################ @@ -37,12 +37,17 @@ DEVBUILDSTYLE = Development DEPBUILDSTYLE = Deployment PBXBUILD = /usr/bin/pbxbuild +XCODEBUILD = /usr/bin/xcodebuild + +BUILDCMD = `if [ -f $(XCODEBUILD) ]; then \ + echo "$(XCODEBUILD)"; \ + else echo "$(PBXBUILD)"; fi` MAKE_VARS := SYMROOT OBJROOT BINDIR APPLICATION_INSTALL_PATH \ TCL_FRAMEWORK_DIR TCLSH_DIR MAKE_ARGS_V = $(foreach v,${MAKE_VARS},$v=${$v}) -BUILD = ${PBXBUILD} -target "${TARGET}" ${MAKE_ARGS_V} \ +BUILD = ${BUILDCMD} -target "${TARGET}" ${MAKE_ARGS_V} \ DYLIB_INSTALL_PATH="${INSTALL_PATH}" \ ${EXTRA_MAKE_ARGS} ${MAKEOVERRIDES} diff --git a/macosx/Wish.pbproj/project.pbxproj b/macosx/Wish.pbproj/project.pbxproj index 48c788c..37a5f26 100644 --- a/macosx/Wish.pbproj/project.pbxproj +++ b/macosx/Wish.pbproj/project.pbxproj @@ -1634,7 +1634,6 @@ MacOS X Port by Jim Ingham <jingham@apple.com> & Ian Reid, Copyright  F53755E1016C38D301DC9062 = { buildActionMask = 2147483647; files = ( - F5C2EA34034D71B2016F146B, ); isa = PBXResourcesBuildPhase; runOnlyForDeploymentPostprocessing = 0; @@ -3545,12 +3544,6 @@ MacOS X Port by Jim Ingham <jingham@apple.com> & Ian Reid, Copyright  path = ../library/mkpsenc.tcl; refType = 2; }; - F5C2EA34034D71B2016F146B = { - fileRef = F5C2EA33034D71B2016F146B; - isa = PBXBuildFile; - settings = { - }; - }; F5C2EA35034D7212016F146B = { fileRef = F5C2EA33034D71B2016F146B; isa = PBXBuildFile; |