diff options
| author | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2011-10-12 17:07:59 +0000 |
|---|---|---|
| committer | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2011-10-12 17:07:59 +0000 |
| commit | fe5e2de5933a5b763753bf7c569f54fca0691869 (patch) | |
| tree | b85fdec60026249029e351da125208c65b390312 | |
| parent | db1798affd224390db5f7c260ab7c898646da65e (diff) | |
the built-in Tcl in Mac OS X tends to be ancient, so prefer the user-installed one in /Library/Frameworks
svn path=/trunk/externals/loaders/tclpd/; revision=15576
| -rw-r--r-- | Makefile | 9 |
1 files changed, 8 insertions, 1 deletions
@@ -127,7 +127,7 @@ ifeq ($(UNAME),Darwin) FAT_FLAGS = -arch ppc -arch i386 -arch x86_64 -mmacosx-version-min=10.4 SOURCES += $(SOURCES_iphoneos) endif - ALL_CFLAGS += $(FAT_FLAGS) -fPIC -I/sw/include + ALL_CFLAGS += $(FAT_FLAGS) -fPIC -I/sw/include -I/Library/Frameworks/Tcl.framework/Headers # if the 'pd' binary exists, check the linking against it to aid with stripping BUNDLE_LOADER = $(shell test ! -e $(PD_PATH)/bin/pd || echo -bundle_loader $(PD_PATH)/bin/pd) ALL_LDFLAGS += $(FAT_FLAGS) -bundle $(BUNDLE_LOADER) -undefined dynamic_lookup -L/sw/lib @@ -314,6 +314,13 @@ single_install: $(LIBRARY_NAME) install-doc install-examples install-manual $(INSTALL_PROGRAM) $(LIBRARY_NAME).$(EXTENSION) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) $(STRIP) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/$(LIBRARY_NAME).$(EXTENSION) $(INSTALL_DATA) pdlib.tcl $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) +ifeq ($(UNAME),Darwin) +# force tclpd to use the Tcl.framework built into Pd-extended + install_name_tool -change \ + /Library/Frameworks/Tcl.framework/Versions/8.5/Tcl \ + @executable_path/../Frameworks/Tcl.framework/Versions/8.5/Tcl \ + $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/$(LIBRARY_NAME).$(EXTENSION) +endif install-doc: $(INSTALL_DIR) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) |