diff options
| author | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2010-04-25 19:51:27 +0000 |
|---|---|---|
| committer | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2010-04-25 19:51:27 +0000 |
| commit | 91c7c0857eba2ed87c91993adc74992a21eaf03f (patch) | |
| tree | fdefb525a918352f28b819e32da9d4b9afa3b7a3 | |
| parent | ccf1df27c7f6ce4780a5064a83d700b91412d924 (diff) | |
fixed iphoneos build and added 64-bit to Mac OS X universal builds if building on 10.5 or newer
svn path=/trunk/; revision=13470
| -rw-r--r-- | externals/vanilla/Makefile | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/externals/vanilla/Makefile b/externals/vanilla/Makefile index bb24f0ce..bdc09d74 100644 --- a/externals/vanilla/Makefile +++ b/externals/vanilla/Makefile @@ -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 |