diff options
| author | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2010-04-26 03:24:09 +0000 |
|---|---|---|
| committer | IOhannes m zmölnig <zmoelnig@iem.at> | 2015-10-14 14:40:10 +0200 |
| commit | fb2e3a8d50568d44af11bdcad6404b0cf507db50 (patch) | |
| tree | 7343cb993f34635916d8c03e2cfaa8c0a1a6b41e | |
| parent | d6ba9999928ae41c5e3801c5c271860615b00700 (diff) | |
on Mac OS X, added 64-bit universal and ~/Library/Pd install location
svn path=/trunk/abstractions/purepd/; revision=13479
| -rw-r--r-- | Makefile | 13 |
1 files changed, 11 insertions, 2 deletions
@@ -66,7 +66,7 @@ UNAME := $(shell uname -s) ifeq ($(UNAME),Darwin) CPU := $(shell uname -p) ifeq ($(CPU),arm) # iPhone/iPod Touch - SOURCES += $(SOURCES_macosx) + SOURCES += $(SOURCES_iphoneos) EXTENSION = pd_darwin OS = iphoneos IPHONE_BASE=/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin @@ -88,7 +88,13 @@ ifeq ($(UNAME),Darwin) EXTENSION = pd_darwin OS = macosx OPT_CFLAGS = -ftree-vectorize -ftree-vectorizer-verbose=2 -fast - FAT_FLAGS = -arch i386 -arch ppc -mmacosx-version-min=10.4 +# build universal 32-bit on 10.4 and 32/64 on newer + ifeq ($(shell uname -r | sed 's|\([0-9][0-9]*\)\.[0-9][0-9]*\.[0-9][0-9]*|\1|'), 8) + FAT_FLAGS = -arch ppc -arch i386 -mmacosx-version-min=10.4 + else + FAT_FLAGS = -arch ppc -arch i386 -arch x86_64 -mmacosx-version-min=10.4 + SOURCES += $(SOURCES_iphoneos) + endif CFLAGS += $(FAT_FLAGS) -fPIC -I/sw/include \ -I/Applications/Pd-extended.app/Contents/Resources/include LDFLAGS += $(FAT_FLAGS) -bundle -undefined dynamic_lookup -L/sw/lib @@ -98,6 +104,8 @@ ifeq ($(UNAME),Darwin) STRIP = strip -x DISTDIR=$(LIBRARY_NAME)-$(LIBRARY_VERSION) DISTBINDIR=$(DISTDIR)-$(OS) +# install into ~/Library/Pd on Mac OS X since /usr/local isn't used much + pkglibdir=$(HOME)/Library/Pd endif endif ifeq ($(UNAME),Linux) @@ -272,3 +280,4 @@ showsetup: @echo "ALLSOURCES: $(ALLSOURCES)" @echo "UNAME: $(UNAME)" @echo "CPU: $(CPU)" + @echo "pkglibdir: $(pkglibdir)" |