summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordas <das>2004-02-23 22:49:26 (GMT)
committerdas <das>2004-02-23 22:49:26 (GMT)
commit3ff435ef8b7848997321a134c3c229a1a11b5896 (patch)
treec16c5e17a042ee9e1b90fa5f96a8aba2ac4b94f2
parentcb7dc7e9a85fafa4069ea7d9befc2b187aff4be9 (diff)
downloadtk-3ff435ef8b7848997321a134c3c229a1a11b5896.zip
tk-3ff435ef8b7848997321a134c3c229a1a11b5896.tar.gz
tk-3ff435ef8b7848997321a134c3c229a1a11b5896.tar.bz2
* macosx/Makefile: ensure that xcodebuild will use the
Wish.pbproj project even if a .xcode project is also present.
-rw-r--r--ChangeLog3
-rw-r--r--macosx/Makefile6
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 265ec73..ae3297b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2004-02-23 Daniel Steffen <das@users.sourceforge.net>
+ * macosx/Makefile: ensure that xcodebuild will use the
+ Wish.pbproj project even if a .xcode project is also present.
+
* macosx/tkMacOSXMouseEvent.c: fixed modifiers for MouseWheel events.
* macosx/Wish.pbproj/project.pbxproj:
diff --git a/macosx/Makefile b/macosx/Makefile
index f10e7ba..9cd14b0 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.12 2004/01/27 10:09:37 das Exp $
+# RCS: @(#) $Id: Makefile,v 1.13 2004/02/23 22:49:26 das Exp $
#
################################################################################
@@ -40,8 +40,8 @@ PBXBUILD = /usr/bin/pbxbuild
XCODEBUILD = /usr/bin/xcodebuild
BUILDCMD = `if [ -f $(XCODEBUILD) ]; then \
- echo "$(XCODEBUILD)"; \
- else echo "$(PBXBUILD)"; fi`
+ echo "$(XCODEBUILD) -project $$(ls -d *.pbproj)"; \
+ else echo "$(PBXBUILD)"; fi`
MAKE_VARS := SYMROOT OBJROOT BINDIR APPLICATION_INSTALL_PATH \
TCL_FRAMEWORK_DIR TCLSH_DIR