summaryrefslogtreecommitdiffstats
path: root/macosx/Makefile
diff options
context:
space:
mode:
authordas <das>2004-01-27 10:09:22 (GMT)
committerdas <das>2004-01-27 10:09:22 (GMT)
commitb943941ae6c6a3b3fbfdae1ee6faeaa1c2935dc6 (patch)
tree5190bf4d0a24d1a2e18c8b19c6e1b0abdec18bf6 /macosx/Makefile
parent22fe40f0cbe218708d83d9ad00f6005e5482566c (diff)
downloadtk-b943941ae6c6a3b3fbfdae1ee6faeaa1c2935dc6.zip
tk-b943941ae6c6a3b3fbfdae1ee6faeaa1c2935dc6.tar.gz
tk-b943941ae6c6a3b3fbfdae1ee6faeaa1c2935dc6.tar.bz2
* 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.
Diffstat (limited to 'macosx/Makefile')
-rw-r--r--macosx/Makefile9
1 files changed, 7 insertions, 2 deletions
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}