diff options
| author | das <das@noemail.net> | 2004-02-23 22:49:25 (GMT) |
|---|---|---|
| committer | das <das@noemail.net> | 2004-02-23 22:49:25 (GMT) |
| commit | 0c4a45dd8051bd3dd9c12243d2886b77baef3b0b (patch) | |
| tree | c16c5e17a042ee9e1b90fa5f96a8aba2ac4b94f2 | |
| parent | 3b6d553bbea393e543c7d7feb261ab604f2bf468 (diff) | |
| download | tk-0c4a45dd8051bd3dd9c12243d2886b77baef3b0b.zip tk-0c4a45dd8051bd3dd9c12243d2886b77baef3b0b.tar.gz tk-0c4a45dd8051bd3dd9c12243d2886b77baef3b0b.tar.bz2 | |
* macosx/Makefile: ensure that xcodebuild will use the
Wish.pbproj project even if a .xcode project is also present.
FossilOrigin-Name: fe8714e70831a574ff9f581b6c9d568978b13984
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | macosx/Makefile | 6 |
2 files changed, 6 insertions, 3 deletions
@@ -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 |