diff --git a/externals/apple/Makefile b/externals/apple/Makefile
index bed1837ec3afb811de5506caee20b7d1a97a576e..b902d0ddb789c760a3c19c0d209d072ec4d6b176 100644
--- a/externals/apple/Makefile
+++ b/externals/apple/Makefile
@@ -92,7 +92,7 @@ ORIGDIR=pd-$(LIBRARY_NAME:~=)_$(LIBRARY_VERSION)
UNAME := $(shell uname -s)
ifeq ($(UNAME),Darwin)
CPU := $(shell uname -p)
- ifeq ($(CPU),arm) # iPhone/iPod Touch
+ ifeq ($(CPU),arm-iphone) # iPhone/iPod Touch
SOURCES += $(SOURCES_iphoneos)
EXTENSION = pd_darwin
SHARED_EXTENSION = dylib
diff --git a/externals/arraysize/Makefile b/externals/arraysize/Makefile
index 3805e841448bb2005610e1a1427471faa1c090ce..51340073b8a55d1cb36b13568c637fe188dd18dd 100644
--- a/externals/arraysize/Makefile
+++ b/externals/arraysize/Makefile
@@ -72,7 +72,7 @@ ORIGDIR=pd-$(LIBRARY_NAME)_$(LIBRARY_VERSION)
UNAME := $(shell uname -s)
ifeq ($(UNAME),Darwin)
CPU := $(shell uname -p)
- ifeq ($(CPU),arm) # iPhone/iPod Touch
+ ifeq ($(CPU),arm-iphone) # iPhone/iPod Touch
SOURCES += $(SOURCES_iphoneos)
EXTENSION = pd_darwin
OS = iphoneos
diff --git a/externals/autotune/Makefile b/externals/autotune/Makefile
index ed41cb625a2a24f123768bd803a3c4e11352edb1..4699cb3758708611ea139126d5b35b29043c7750 100644
--- a/externals/autotune/Makefile
+++ b/externals/autotune/Makefile
@@ -70,7 +70,7 @@ ALLSOURCES := $(SOURCES) $(SOURCES_android) $(SOURCES_cygwin) $(SOURCES_macosx)
UNAME := $(shell uname -s)
ifeq ($(UNAME),Darwin)
CPU := $(shell uname -p)
- ifeq ($(CPU),arm) # iPhone/iPod Touch
+ ifeq ($(CPU),arm-iphone) # iPhone/iPod Touch
SOURCES += $(SOURCES_iphoneos)
EXTENSION = pd_darwin
OS = iphoneos
diff --git a/externals/bassemu~/Makefile b/externals/bassemu~/Makefile
index 00d2eb4207e7ccccfbbe9f95985a879005bfb0a1..d410aee13350f917065ae8d7c8e32b7c642657af 100644
--- a/externals/bassemu~/Makefile
+++ b/externals/bassemu~/Makefile
@@ -71,7 +71,7 @@ ORIGDIR=pd-$(LIBRARY_NAME:~=)_$(LIBRARY_VERSION)
UNAME := $(shell uname -s)
ifeq ($(UNAME),Darwin)
CPU := $(shell uname -p)
- ifeq ($(CPU),arm) # iPhone/iPod Touch
+ ifeq ($(CPU),arm-iphone) # iPhone/iPod Touch
SOURCES += $(SOURCES_iphoneos)
EXTENSION = pd_darwin
OS = iphoneos
diff --git a/externals/beatpipe/Makefile b/externals/beatpipe/Makefile
index cd2c30c08804fee9f3544e3262416453074664bb..08cfd9ce91445c0014c07616e7332462a25389f6 100644
--- a/externals/beatpipe/Makefile
+++ b/externals/beatpipe/Makefile
@@ -68,7 +68,7 @@ ORIGDIR=pd-$(LIBRARY_NAME)_$(LIBRARY_VERSION)
UNAME := $(shell uname -s)
ifeq ($(UNAME),Darwin)
CPU := $(shell uname -p)
- ifeq ($(CPU),arm) # iPhone/iPod Touch
+ ifeq ($(CPU),arm-iphone) # iPhone/iPod Touch
SOURCES += $(SOURCES_iphoneos)
EXTENSION = pd_darwin
OS = iphoneos
diff --git a/externals/boids/Makefile b/externals/boids/Makefile
index ad0e4d1e0f46531bcd5f316ea240b8061dce0fe6..07416a052dfad5e2bd35721e79e94b85340b3e6c 100644
--- a/externals/boids/Makefile
+++ b/externals/boids/Makefile
@@ -72,7 +72,7 @@ ORIGDIR=pd-$(LIBRARY_NAME:~=)_$(LIBRARY_VERSION)
UNAME := $(shell uname -s)
ifeq ($(UNAME),Darwin)
CPU := $(shell uname -p)
- ifeq ($(CPU),arm) # iPhone/iPod Touch
+ ifeq ($(CPU),arm-iphone) # iPhone/iPod Touch
SOURCES += $(SOURCES_iphoneos)
EXTENSION = pd_darwin
OS = iphoneos
diff --git a/externals/bsaylor/Makefile b/externals/bsaylor/Makefile
index e60e961d34989bdbf78c7e9adb83e935097238d7..a0f75b2e7ca4a83a4d9002edf9c4b31dea7ff822 100644
--- a/externals/bsaylor/Makefile
+++ b/externals/bsaylor/Makefile
@@ -73,7 +73,7 @@ ORIGDIR=pd-$(LIBRARY_NAME:~=)_$(LIBRARY_VERSION)
UNAME := $(shell uname -s)
ifeq ($(UNAME),Darwin)
CPU := $(shell uname -p)
- ifeq ($(CPU),arm) # iPhone/iPod Touch
+ ifeq ($(CPU),arm-iphone) # iPhone/iPod Touch
SOURCES += $(SOURCES_iphoneos)
EXTENSION = pd_darwin
OS = iphoneos
diff --git a/externals/cxc/Makefile b/externals/cxc/Makefile
index 61fbc3c9b19260bb7d1f9c504872fdb45c3a8d8e..e42a53d3b61aeb4b5517e78f4eff3473be1ff23f 100644
--- a/externals/cxc/Makefile
+++ b/externals/cxc/Makefile
@@ -75,7 +75,7 @@ ORIGDIR=pd-$(LIBRARY_NAME)_$(LIBRARY_VERSION)
UNAME := $(shell uname -s)
ifeq ($(UNAME),Darwin)
CPU := $(shell uname -p)
- ifeq ($(CPU),arm) # iPhone/iPod Touch
+ ifeq ($(CPU),arm-iphone) # iPhone/iPod Touch
SOURCES += $(SOURCES_iphoneos)
EXTENSION = pd_darwin
OS = iphoneos
diff --git a/externals/deprecated/Makefile b/externals/deprecated/Makefile
index ba76cc59cb71b3cc39d43ff802cf76c6db6e060f..fdad97921cd7bdbb05846bf54bbf6c3abac40892 100644
--- a/externals/deprecated/Makefile
+++ b/externals/deprecated/Makefile
@@ -56,7 +56,7 @@ ALLSOURCES := $(SOURCES) $(SOURCES_android) $(SOURCES_cygwin) $(SOURCES_macosx)
UNAME := $(shell uname -s)
ifeq ($(UNAME),Darwin)
CPU := $(shell uname -p)
- ifeq ($(CPU),arm) # iPhone/iPod Touch
+ ifeq ($(CPU),arm-iphone) # iPhone/iPod Touch
SOURCES += $(SOURCES_macosx)
EXTENSION = pd_darwin
OS = iphoneos
diff --git a/externals/earplug~/Makefile b/externals/earplug~/Makefile
index 63b0683960a9370c187b5cf0409c32e283935ab4..339ef72134d77c19e6a9cd87ecf0cee993d81ec3 100644
--- a/externals/earplug~/Makefile
+++ b/externals/earplug~/Makefile
@@ -71,7 +71,7 @@ ORIGDIR=pd-$(LIBRARY_NAME:~=)_$(LIBRARY_VERSION)
UNAME := $(shell uname -s)
ifeq ($(UNAME),Darwin)
CPU := $(shell uname -p)
- ifeq ($(CPU),arm) # iPhone/iPod Touch
+ ifeq ($(CPU),arm-iphone) # iPhone/iPod Touch
SOURCES += $(SOURCES_iphoneos)
EXTENSION = pd_darwin
OS = iphoneos
diff --git a/externals/ekext/Makefile b/externals/ekext/Makefile
index 322c5162251c5b2f35dc43366335639c90bde54a..b3dfbead2b73ae03f859d4db4714662089c17f41 100644
--- a/externals/ekext/Makefile
+++ b/externals/ekext/Makefile
@@ -71,7 +71,7 @@ ORIGDIR=pd-$(LIBRARY_NAME)_$(LIBRARY_VERSION)
UNAME := $(shell uname -s)
ifeq ($(UNAME),Darwin)
CPU := $(shell uname -p)
- ifeq ($(CPU),arm) # iPhone/iPod Touch
+ ifeq ($(CPU),arm-iphone) # iPhone/iPod Touch
SOURCES += $(SOURCES_iphoneos)
EXTENSION = pd_darwin
OS = iphoneos
diff --git a/externals/ext13/Makefile b/externals/ext13/Makefile
index 3ca4e4f7eb804f81acb4d08e9df9cc18fea74257..c6029f67b0ba72dd307a09721662e7d29e4a5446 100644
--- a/externals/ext13/Makefile
+++ b/externals/ext13/Makefile
@@ -77,7 +77,7 @@ ORIGDIR=pd-$(LIBRARY_NAME)_$(LIBRARY_VERSION)
UNAME := $(shell uname -s)
ifeq ($(UNAME),Darwin)
CPU := $(shell uname -p)
- ifeq ($(CPU),arm) # iPhone/iPod Touch
+ ifeq ($(CPU),arm-iphone) # iPhone/iPod Touch
SOURCES += $(SOURCES_iphoneos)
EXTENSION = pd_darwin
OS = iphoneos
diff --git a/externals/ezfile/Makefile b/externals/ezfile/Makefile
index 858cef59198cbd97c6e7365abc181353a7ea8775..4b7c252ec372dfeaa1846e64ae358b2223cacb21 100644
--- a/externals/ezfile/Makefile
+++ b/externals/ezfile/Makefile
@@ -67,7 +67,7 @@ ORIGDIR=pd-$(LIBRARY_NAME)_$(LIBRARY_VERSION)
UNAME := $(shell uname -s)
ifeq ($(UNAME),Darwin)
CPU := $(shell uname -p)
- ifeq ($(CPU),arm) # iPhone/iPod Touch
+ ifeq ($(CPU),arm-iphone) # iPhone/iPod Touch
SOURCES += $(SOURCES_iphoneos)
EXTENSION = pd_darwin
OS = iphoneos
diff --git a/externals/fftease/Makefile b/externals/fftease/Makefile
index d58a63a6ac6d5a225932a3e54d066816f8aa4e14..36eebfbda4f4bd86698e5692956e7b9c50673668 100644
--- a/externals/fftease/Makefile
+++ b/externals/fftease/Makefile
@@ -92,7 +92,7 @@ ORIGDIR=pd-$(LIBRARY_NAME:~=)_$(LIBRARY_VERSION)
UNAME := $(shell uname -s)
ifeq ($(UNAME),Darwin)
CPU := $(shell uname -p)
- ifeq ($(CPU),arm) # iPhone/iPod Touch
+ ifeq ($(CPU),arm-iphone) # iPhone/iPod Touch
SOURCES += $(SOURCES_iphoneos)
EXTENSION = pd_darwin
SHARED_EXTENSION = dylib
diff --git a/externals/freeverb~/Makefile b/externals/freeverb~/Makefile
index c5bc5dd49267dc35de2da6e9d6b18ac3cad5feef..6c4b338c63eb37a8eaee3946a68a2183f936be67 100644
--- a/externals/freeverb~/Makefile
+++ b/externals/freeverb~/Makefile
@@ -71,7 +71,7 @@ ORIGDIR=pd-$(LIBRARY_NAME:~=)_$(LIBRARY_VERSION)
UNAME := $(shell uname -s)
ifeq ($(UNAME),Darwin)
CPU := $(shell uname -p)
- ifeq ($(CPU),arm) # iPhone/iPod Touch
+ ifeq ($(CPU),arm-iphone) # iPhone/iPod Touch
SOURCES += $(SOURCES_iphoneos)
EXTENSION = pd_darwin
OS = iphoneos
diff --git a/externals/ggee/Makefile b/externals/ggee/Makefile
index 1dea6b62c71d648420e0852804b8cd7638a0ad50..a9fe4d6c52d8c51be5bc2c18702b48a297845abb 100644
--- a/externals/ggee/Makefile
+++ b/externals/ggee/Makefile
@@ -74,7 +74,7 @@ ORIGDIR=pd-$(LIBRARY_NAME:~=)_$(LIBRARY_VERSION)
UNAME := $(shell uname -s)
ifeq ($(UNAME),Darwin)
CPU := $(shell uname -p)
- ifeq ($(CPU),arm) # iPhone/iPod Touch
+ ifeq ($(CPU),arm-iphone) # iPhone/iPod Touch
SOURCES += $(SOURCES_iphoneos)
EXTENSION = pd_darwin
OS = iphoneos
diff --git a/externals/hcs/Makefile b/externals/hcs/Makefile
index cf2ec2dc80e4feb9946f716cb20225e13e03293e..421a815205f2904b9d1016762bb64b979cdba1c2 100644
--- a/externals/hcs/Makefile
+++ b/externals/hcs/Makefile
@@ -83,7 +83,7 @@ ORIGDIR=pd-$(LIBRARY_NAME:~=)_$(LIBRARY_VERSION)
UNAME := $(shell uname -s)
ifeq ($(UNAME),Darwin)
CPU := $(shell uname -p)
- ifeq ($(CPU),arm) # iPhone/iPod Touch
+ ifeq ($(CPU),arm-iphone) # iPhone/iPod Touch
SOURCES += $(SOURCES_iphoneos)
EXTENSION = pd_darwin
SHARED_EXTENSION = dylib
diff --git a/externals/hcs/usbhid/Makefile b/externals/hcs/usbhid/Makefile
index 62830c9f92ab46e9bf4d1dd925c0db5b5ce32a2b..c59922c7a2d1dbb67a8ad49f8a8edfdb6693b259 100644
--- a/externals/hcs/usbhid/Makefile
+++ b/externals/hcs/usbhid/Makefile
@@ -59,7 +59,7 @@ ALLSOURCES := $(SOURCES) $(SOURCES_android) $(SOURCES_cygwin) $(SOURCES_macosx)
UNAME := $(shell uname -s)
ifeq ($(UNAME),Darwin)
CPU := $(shell uname -p)
- ifeq ($(CPU),arm) # iPhone/iPod Touch
+ ifeq ($(CPU),arm-iphone) # iPhone/iPod Touch
SOURCES += $(SOURCES_macosx)
EXTENSION = pd_darwin
OS = iphoneos
diff --git a/externals/iem/comport/comport/Makefile b/externals/iem/comport/comport/Makefile
index b4640e07078a46f23194f977badfb1a54157c5e0..d69f91dc497194018cfb36d988559f279e655a01 100644
--- a/externals/iem/comport/comport/Makefile
+++ b/externals/iem/comport/comport/Makefile
@@ -71,7 +71,7 @@ ORIGDIR=pd-$(LIBRARY_NAME)_$(LIBRARY_VERSION)
UNAME := $(shell uname -s)
ifeq ($(UNAME),Darwin)
CPU := $(shell uname -p)
- ifeq ($(CPU),arm) # iPhone/iPod Touch
+ ifeq ($(CPU),arm-iphone) # iPhone/iPod Touch
SOURCES += $(SOURCES_iphoneos)
EXTENSION = pd_darwin
OS = iphoneos
diff --git a/externals/iem/iemguts/Makefile b/externals/iem/iemguts/Makefile
index d0112bc68bdbcceb410cb130bbad49fe5e09e857..7be684eef604b5864fb39856ffbeb442478eb27b 100644
--- a/externals/iem/iemguts/Makefile
+++ b/externals/iem/iemguts/Makefile
@@ -121,7 +121,7 @@ ORIGDIR=pd-$(LIBRARY_NAME)_$(LIBRARY_VERSION)
UNAME := $(shell uname -s)
CPU := $(shell uname -p)
ifeq ($(UNAME),Darwin)
- ifeq ($(CPU),arm) # iPhone/iPod Touch
+ ifeq ($(CPU),arm-iphone) # iPhone/iPod Touch
SOURCES += $(SOURCES_iphoneos)
EXTENSION = pd_darwin
OS = iphoneos
diff --git a/externals/iem/iemnet/Makefile b/externals/iem/iemnet/Makefile
index 8e396c1c2b18d26019ce6e0d096c4d9119972eee..2fd8b7bf62ded6b8b53bdf17a111ec7ef2939345 100644
--- a/externals/iem/iemnet/Makefile
+++ b/externals/iem/iemnet/Makefile
@@ -69,7 +69,7 @@ ALLSOURCES := $(SOURCES) $(SOURCES_android) $(SOURCES_cygwin) $(SOURCES_macosx)
UNAME := $(shell uname -s)
ifeq ($(UNAME),Darwin)
CPU := $(shell uname -p)
- ifeq ($(CPU),arm) # iPhone/iPod Touch
+ ifeq ($(CPU),arm-iphone) # iPhone/iPod Touch
SOURCES += $(SOURCES_macosx)
EXTENSION = pd_darwin
OS = iphoneos
diff --git a/externals/iem/syslog/Makefile b/externals/iem/syslog/Makefile
index aea5c7f661249d36b0d499ae7993649b42496cab..0010029260c4fefe43149085fbe55748ce55af40 100644
--- a/externals/iem/syslog/Makefile
+++ b/externals/iem/syslog/Makefile
@@ -82,7 +82,7 @@ ORIGDIR=pd-$(LIBRARY_NAME:~=)_$(LIBRARY_VERSION)
UNAME := $(shell uname -s)
ifeq ($(UNAME),Darwin)
CPU := $(shell uname -p)
- ifeq ($(CPU),arm) # iPhone/iPod Touch
+ ifeq ($(CPU),arm-iphone) # iPhone/iPod Touch
SOURCES += $(SOURCES_iphoneos)
EXTENSION = pd_darwin
OS = iphoneos
diff --git a/externals/import/Makefile b/externals/import/Makefile
index 42985284bc0aae77aedce38b6c8a62077fd92aee..493378c3bfb8d81d77253c145a1290045baa430f 100644
--- a/externals/import/Makefile
+++ b/externals/import/Makefile
@@ -67,7 +67,7 @@ ORIGDIR=puredata-$(LIBRARY_NAME:~=)_$(LIBRARY_VERSION)
UNAME := $(shell uname -s)
ifeq ($(UNAME),Darwin)
CPU := $(shell uname -p)
- ifeq ($(CPU),arm) # iPhone/iPod Touch
+ ifeq ($(CPU),arm-iphone) # iPhone/iPod Touch
SOURCES += $(SOURCES_iphoneos)
EXTENSION = pd_darwin
OS = iphoneos
diff --git a/externals/io/sixaxis/Makefile b/externals/io/sixaxis/Makefile
index 0252b65cc4dcf04afab8884a924db20d8d2c9a24..16df4ac194336064932efb88dde7588d57c48a10 100644
--- a/externals/io/sixaxis/Makefile
+++ b/externals/io/sixaxis/Makefile
@@ -55,7 +55,7 @@ ALLSOURCES := $(SOURCES) $(SOURCES_android) $(SOURCES_cygwin) $(SOURCES_macosx)
UNAME := $(shell uname -s)
ifeq ($(UNAME),Darwin)
CPU := $(shell uname -p)
- ifeq ($(CPU),arm) # iPhone/iPod Touch
+ ifeq ($(CPU),arm-iphone) # iPhone/iPod Touch
SOURCES += $(SOURCES_macosx)
EXTENSION = pd_darwin
OS = iphoneos
diff --git a/externals/io/xbee/Makefile b/externals/io/xbee/Makefile
index 61d037446455a50ee658aa9c325e1edfd81575d7..8aa838d20b4c2b0ab7a82de6904211ebad61e15e 100644
--- a/externals/io/xbee/Makefile
+++ b/externals/io/xbee/Makefile
@@ -55,7 +55,7 @@ ALLSOURCES := $(SOURCES) $(SOURCES_android) $(SOURCES_cygwin) $(SOURCES_macosx)
UNAME := $(shell uname -s)
ifeq ($(UNAME),Darwin)
CPU := $(shell uname -p)
- ifeq ($(CPU),arm) # iPhone/iPod Touch
+ ifeq ($(CPU),arm-iphone) # iPhone/iPod Touch
SOURCES += $(SOURCES_macosx)
EXTENSION = pd_darwin
OS = iphoneos
diff --git a/externals/loaders/libdir/Makefile b/externals/loaders/libdir/Makefile
index 2ccebd7737cbce5958797ff2ec684c83bcf8f661..5146d924fef185f953a79d252bc50b12ffb1d835 100644
--- a/externals/loaders/libdir/Makefile
+++ b/externals/loaders/libdir/Makefile
@@ -71,7 +71,7 @@ ORIGDIR=pd-$(LIBRARY_NAME)_$(LIBRARY_VERSION)
UNAME := $(shell uname -s)
ifeq ($(UNAME),Darwin)
CPU := $(shell uname -p)
- ifeq ($(CPU),arm) # iPhone/iPod Touch
+ ifeq ($(CPU),arm-iphone) # iPhone/iPod Touch
SOURCES += $(SOURCES_iphoneos)
EXTENSION = pd_darwin
OS = iphoneos
diff --git a/externals/lyonpotpourri/Makefile b/externals/lyonpotpourri/Makefile
index 85a240b8b1b3dfa279182c8bbf8ff4c0dc5e8fc7..19977248f7db7ebec74144a9c150b400396f6f33 100755
--- a/externals/lyonpotpourri/Makefile
+++ b/externals/lyonpotpourri/Makefile
@@ -86,7 +86,7 @@ ORIGDIR=pd-$(LIBRARY_NAME:~=)_$(LIBRARY_VERSION)
UNAME := $(shell uname -s)
ifeq ($(UNAME),Darwin)
CPU := $(shell uname -p)
- ifeq ($(CPU),arm) # iPhone/iPod Touch
+ ifeq ($(CPU),arm-iphone) # iPhone/iPod Touch
SOURCES += $(SOURCES_iphoneos)
EXTENSION = pd_darwin
SHARED_EXTENSION = dylib
diff --git a/externals/mapping/Makefile b/externals/mapping/Makefile
index 81f2a72f262ebb9a9d37422ff8561dd19cdc97a0..317247671589f995da60bfeee14a27ed4eac69a9 100644
--- a/externals/mapping/Makefile
+++ b/externals/mapping/Makefile
@@ -71,7 +71,7 @@ ORIGDIR=pd-$(LIBRARY_NAME)_$(LIBRARY_VERSION)
UNAME := $(shell uname -s)
ifeq ($(UNAME),Darwin)
CPU := $(shell uname -p)
- ifeq ($(CPU),arm) # iPhone/iPod Touch
+ ifeq ($(CPU),arm-iphone) # iPhone/iPod Touch
SOURCES += $(SOURCES_iphoneos)
EXTENSION = pd_darwin
OS = iphoneos
diff --git a/externals/markex/Makefile b/externals/markex/Makefile
index 1d1031d0fd1f7ba7457fcdeb288c4ad8e95580b3..70761d257dc0f432efb8670ca1dfd9799406d7c9 100644
--- a/externals/markex/Makefile
+++ b/externals/markex/Makefile
@@ -78,7 +78,7 @@ ORIGDIR=pd-$(LIBRARY_NAME:~=)_$(LIBRARY_VERSION)
UNAME := $(shell uname -s)
ifeq ($(UNAME),Darwin)
CPU := $(shell uname -p)
- ifeq ($(CPU),arm) # iPhone/iPod Touch
+ ifeq ($(CPU),arm-iphone) # iPhone/iPod Touch
SOURCES += $(SOURCES_iphoneos)
EXTENSION = pd_darwin
SHARED_EXTENSION = dylib
diff --git a/externals/maxlib/Makefile b/externals/maxlib/Makefile
index 437f27c5d5be36170ed1c3be33da3e9748fb51d8..92dcaa61436be151524484d07eaf39782427f549 100644
--- a/externals/maxlib/Makefile
+++ b/externals/maxlib/Makefile
@@ -82,7 +82,7 @@ ORIGDIR=pd-$(LIBRARY_NAME:~=)_$(LIBRARY_VERSION)
UNAME := $(shell uname -s)
ifeq ($(UNAME),Darwin)
CPU := $(shell uname -p)
- ifeq ($(CPU),arm) # iPhone/iPod Touch
+ ifeq ($(CPU),arm-iphone) # iPhone/iPod Touch
SOURCES += $(SOURCES_iphoneos)
EXTENSION = pd_darwin
SHARED_EXTENSION = dylib
diff --git a/externals/miXed/cyclone/Makefile.libdir b/externals/miXed/cyclone/Makefile.libdir
index 08b15a49bf84452cb55b2ee6d9ccd0bc0b88c7af..7812c36f01f5b41a6f9dd70b663314b4603a73e8 100644
--- a/externals/miXed/cyclone/Makefile.libdir
+++ b/externals/miXed/cyclone/Makefile.libdir
@@ -18,7 +18,7 @@ ifeq ($(UNAME),Darwin)
macos_target = 10.9
endif
CPU := $(shell uname -p)
- ifeq ($(CPU),arm) # iPhone/iPod Touch
+ ifeq ($(CPU),arm-iphone) # iPhone/iPod Touch
EXTENSION = pd_darwin
CYCLIST_BIN = cyclist
OS = iphoneos
diff --git a/externals/mjlib/Makefile b/externals/mjlib/Makefile
index 85e2d8d2c20205ffee671f3e783a25d25ee940d5..fbd3274a7ec6b9c264df69c881eec543dbcd28a1 100644
--- a/externals/mjlib/Makefile
+++ b/externals/mjlib/Makefile
@@ -72,7 +72,7 @@ ORIGDIR=pd-$(LIBRARY_NAME)_$(LIBRARY_VERSION)
UNAME := $(shell uname -s)
ifeq ($(UNAME),Darwin)
CPU := $(shell uname -p)
- ifeq ($(CPU),arm) # iPhone/iPod Touch
+ ifeq ($(CPU),arm-iphone) # iPhone/iPod Touch
SOURCES += $(SOURCES_iphoneos)
EXTENSION = pd_darwin
OS = iphoneos
diff --git a/externals/moonlib/Makefile b/externals/moonlib/Makefile
index 79c9c70e1003bda37213710b11de97aa99b82270..bbb465e7118bb02b809ed0bd3aaa84f33f0b2130 100644
--- a/externals/moonlib/Makefile
+++ b/externals/moonlib/Makefile
@@ -82,7 +82,7 @@ ORIGDIR=pd-$(LIBRARY_NAME:~=)_$(LIBRARY_VERSION)
UNAME := $(shell uname -s)
ifeq ($(UNAME),Darwin)
CPU := $(shell uname -p)
- ifeq ($(CPU),arm) # iPhone/iPod Touch
+ ifeq ($(CPU),arm-iphone) # iPhone/iPod Touch
SOURCES += $(SOURCES_iphoneos)
EXTENSION = pd_darwin
SHARED_EXTENSION = dylib
diff --git a/externals/motex/Makefile b/externals/motex/Makefile
index 711e7e64ff69a24127caf432d2109143a91606bc..fb2932bcbb56ae6db7b883af4f41df02791ec0e4 100644
--- a/externals/motex/Makefile
+++ b/externals/motex/Makefile
@@ -72,7 +72,7 @@ ORIGDIR=pd-$(LIBRARY_NAME)_$(LIBRARY_VERSION)
UNAME := $(shell uname -s)
ifeq ($(UNAME),Darwin)
CPU := $(shell uname -p)
- ifeq ($(CPU),arm) # iPhone/iPod Touch
+ ifeq ($(CPU),arm-iphone) # iPhone/iPod Touch
SOURCES += $(SOURCES_iphoneos)
EXTENSION = pd_darwin
OS = iphoneos
diff --git a/externals/mrpeach/Makefile b/externals/mrpeach/Makefile
index 027550c585c33921cd75669047ca3d184aa6b96d..7839cdf4d3e04d88a142430d2d1d28d96e006ee1 100644
--- a/externals/mrpeach/Makefile
+++ b/externals/mrpeach/Makefile
@@ -101,7 +101,7 @@ ORIGDIR=pd-$(LIBRARY_NAME:~=)_$(LIBRARY_VERSION)
UNAME := $(shell uname -s)
ifeq ($(UNAME),Darwin)
CPU := $(shell uname -p)
- ifeq ($(CPU),arm) # iPhone/iPod Touch
+ ifeq ($(CPU),arm-iphone) # iPhone/iPod Touch
SOURCES += $(SOURCES_iphoneos)
EXTENSION = pd_darwin
SHARED_EXTENSION = dylib
diff --git a/externals/mrpeach/cmos/Makefile b/externals/mrpeach/cmos/Makefile
index 10b93de7ecef8ca9f1067540921687d195d84526..e04c3741eddf60ae0f3f8e382dde56a76ad924da 100644
--- a/externals/mrpeach/cmos/Makefile
+++ b/externals/mrpeach/cmos/Makefile
@@ -86,7 +86,7 @@ ORIGDIR=pd-$(LIBRARY_NAME:~=)_$(LIBRARY_VERSION)
UNAME := $(shell uname -s)
ifeq ($(UNAME),Darwin)
CPU := $(shell uname -p)
- ifeq ($(CPU),arm) # iPhone/iPod Touch
+ ifeq ($(CPU),arm-iphone) # iPhone/iPod Touch
SOURCES += $(SOURCES_iphoneos)
EXTENSION = pd_darwin
SHARED_EXTENSION = dylib
diff --git a/externals/mrpeach/net/Makefile b/externals/mrpeach/net/Makefile
index fafcbf8f5d615d59301e5d8bfe50428ddcd8ae9d..ecf007a028cb478c05efbca0a61b2441a2186d25 100644
--- a/externals/mrpeach/net/Makefile
+++ b/externals/mrpeach/net/Makefile
@@ -79,7 +79,7 @@ ORIGDIR=pd-$(LIBRARY_NAME:~=)_$(LIBRARY_VERSION)
UNAME := $(shell uname -s)
ifeq ($(UNAME),Darwin)
CPU := $(shell uname -p)
- ifeq ($(CPU),arm) # iPhone/iPod Touch
+ ifeq ($(CPU),arm-iphone) # iPhone/iPod Touch
SOURCES += $(SOURCES_iphoneos)
EXTENSION = pd_darwin
SHARED_EXTENSION = dylib
diff --git a/externals/mrpeach/osc/Makefile b/externals/mrpeach/osc/Makefile
index cf096240258490cb6d97ea3f8fa40c393f1a6d9c..224ccd31878652f1f0da7ff219a68f7f6675b041 100644
--- a/externals/mrpeach/osc/Makefile
+++ b/externals/mrpeach/osc/Makefile
@@ -88,7 +88,7 @@ ORIGDIR=pd-$(LIBRARY_NAME:~=)_$(LIBRARY_VERSION)
UNAME := $(shell uname -s)
ifeq ($(UNAME),Darwin)
CPU := $(shell uname -p)
- ifeq ($(CPU),arm) # iPhone/iPod Touch
+ ifeq ($(CPU),arm-iphone) # iPhone/iPod Touch
SOURCES += $(SOURCES_iphoneos)
EXTENSION = pd_darwin
OS = iphoneos
diff --git a/externals/mrpeach/sqosc~/sqosc~.c b/externals/mrpeach/sqosc~/sqosc~.c
index d4f8b35be787c2353448b9355bde5013abadab99..5dac4a361ef013b569f8e1c3f2dea7645f22e4a5 100644
--- a/externals/mrpeach/sqosc~/sqosc~.c
+++ b/externals/mrpeach/sqosc~/sqosc~.c
@@ -37,6 +37,7 @@
#ifdef __APPLE__
#define __BYTE_ORDER BYTE_ORDER
#define __LITTLE_ENDIAN LITTLE_ENDIAN
+extern int finite(double);
#endif
#ifdef __linux__
diff --git a/externals/nusmuk/lightboard/Makefile b/externals/nusmuk/lightboard/Makefile
index 9869e2a0d2945c856cdac81bd1ab6d27a25c6ee7..0669d357fe2969be258b88aa7526a0281724e62a 100644
--- a/externals/nusmuk/lightboard/Makefile
+++ b/externals/nusmuk/lightboard/Makefile
@@ -67,7 +67,7 @@ ORIGDIR=pd-$(LIBRARY_NAME:~=)_$(LIBRARY_VERSION)
UNAME := $(shell uname -s)
ifeq ($(UNAME),Darwin)
CPU := $(shell uname -p)
- ifeq ($(CPU),arm) # iPhone/iPod Touch
+ ifeq ($(CPU),arm-iphone) # iPhone/iPod Touch
SOURCES += $(SOURCES_iphoneos)
EXTENSION = pd_darwin
OS = iphoneos
diff --git a/externals/nusmuk/linear-cue-system/Makefile b/externals/nusmuk/linear-cue-system/Makefile
index 548c6baed1618b38efa37dae580c8989b2873365..ef7ba69b4abf3f26cfee0b8a8e48ba3319cdc104 100644
--- a/externals/nusmuk/linear-cue-system/Makefile
+++ b/externals/nusmuk/linear-cue-system/Makefile
@@ -67,7 +67,7 @@ ORIGDIR=pd-$(LIBRARY_NAME:~=)_$(LIBRARY_VERSION)
UNAME := $(shell uname -s)
ifeq ($(UNAME),Darwin)
CPU := $(shell uname -p)
- ifeq ($(CPU),arm) # iPhone/iPod Touch
+ ifeq ($(CPU),arm-iphone) # iPhone/iPod Touch
SOURCES += $(SOURCES_iphoneos)
EXTENSION = pd_darwin
OS = iphoneos
diff --git a/externals/nusmuk/nusmuk-audio/Makefile b/externals/nusmuk/nusmuk-audio/Makefile
index f00519a4289d6708f4c03ba89b15bb24376f4c79..d431d4e15ae2cc609234aba033b57cc1937384c2 100644
--- a/externals/nusmuk/nusmuk-audio/Makefile
+++ b/externals/nusmuk/nusmuk-audio/Makefile
@@ -67,7 +67,7 @@ ORIGDIR=pd-$(LIBRARY_NAME:~=)_$(LIBRARY_VERSION)
UNAME := $(shell uname -s)
ifeq ($(UNAME),Darwin)
CPU := $(shell uname -p)
- ifeq ($(CPU),arm) # iPhone/iPod Touch
+ ifeq ($(CPU),arm-iphone) # iPhone/iPod Touch
SOURCES += $(SOURCES_iphoneos)
EXTENSION = pd_darwin
OS = iphoneos
diff --git a/externals/nusmuk/nusmuk-utils/Makefile b/externals/nusmuk/nusmuk-utils/Makefile
index 4f8c6ca2badea2d6bc3907cba50a719991bd64c1..fe21215946ba7435c1cf642b3016dedd75377423 100644
--- a/externals/nusmuk/nusmuk-utils/Makefile
+++ b/externals/nusmuk/nusmuk-utils/Makefile
@@ -67,7 +67,7 @@ ORIGDIR=pd-$(LIBRARY_NAME:~=)_$(LIBRARY_VERSION)
UNAME := $(shell uname -s)
ifeq ($(UNAME),Darwin)
CPU := $(shell uname -p)
- ifeq ($(CPU),arm) # iPhone/iPod Touch
+ ifeq ($(CPU),arm-iphone) # iPhone/iPod Touch
SOURCES += $(SOURCES_iphoneos)
EXTENSION = pd_darwin
OS = iphoneos
diff --git a/externals/nusmuk/puremapping/Makefile b/externals/nusmuk/puremapping/Makefile
index 66023afeeda7f546b2610c505f2c156f23c2fd56..544eac6619fbcb62ce3528cf07792d23933bac83 100644
--- a/externals/nusmuk/puremapping/Makefile
+++ b/externals/nusmuk/puremapping/Makefile
@@ -67,7 +67,7 @@ ORIGDIR=pd-$(LIBRARY_NAME:~=)_$(LIBRARY_VERSION)
UNAME := $(shell uname -s)
ifeq ($(UNAME),Darwin)
CPU := $(shell uname -p)
- ifeq ($(CPU),arm) # iPhone/iPod Touch
+ ifeq ($(CPU),arm-iphone) # iPhone/iPod Touch
SOURCES += $(SOURCES_iphoneos)
EXTENSION = pd_darwin
OS = iphoneos
diff --git a/externals/pan/Makefile b/externals/pan/Makefile
index 60f52792f8ac3e738229ed80d0d0e819bf824495..30979e43b464538c2d622d2538e66e5dc9166001 100644
--- a/externals/pan/Makefile
+++ b/externals/pan/Makefile
@@ -71,7 +71,7 @@ ORIGDIR=pd-$(LIBRARY_NAME)_$(LIBRARY_VERSION)
UNAME := $(shell uname -s)
ifeq ($(UNAME),Darwin)
CPU := $(shell uname -p)
- ifeq ($(CPU),arm) # iPhone/iPod Touch
+ ifeq ($(CPU),arm-iphone) # iPhone/iPod Touch
SOURCES += $(SOURCES_iphoneos)
EXTENSION = pd_darwin
OS = iphoneos
diff --git a/externals/pddp/Makefile b/externals/pddp/Makefile
index 5709fbaed740872d30d20d89437635dba33ce7a4..cd61c13919a384ac03abd9f26d9138cfc5f7798f 100644
--- a/externals/pddp/Makefile
+++ b/externals/pddp/Makefile
@@ -78,7 +78,7 @@ ORIGDIR=pd-$(LIBRARY_NAME:~=)_$(LIBRARY_VERSION)
UNAME := $(shell uname -s)
ifeq ($(UNAME),Darwin)
CPU := $(shell uname -p)
- ifeq ($(CPU),arm) # iPhone/iPod Touch
+ ifeq ($(CPU),arm-iphone) # iPhone/iPod Touch
SOURCES += $(SOURCES_iphoneos)
EXTENSION = pd_darwin
SHARED_EXTENSION = dylib
diff --git a/externals/pdogg/Makefile b/externals/pdogg/Makefile
index 1be2ac87e3bbf5086e115a7e459c4bdd7eda6b66..7cb9e910287c07d92ac8f53af0b031411464943a 100644
--- a/externals/pdogg/Makefile
+++ b/externals/pdogg/Makefile
@@ -85,7 +85,7 @@ ORIGDIR=pd-$(LIBRARY_NAME:~=)_$(LIBRARY_VERSION)
UNAME := $(shell uname -s)
ifeq ($(UNAME),Darwin)
CPU := $(shell uname -p)
- ifeq ($(CPU),arm) # iPhone/iPod Touch
+ ifeq ($(CPU),arm-iphone) # iPhone/iPod Touch
SOURCES += $(SOURCES_iphoneos)
EXTENSION = pd_darwin
SHARED_EXTENSION = dylib
diff --git a/externals/plugin~/Makefile b/externals/plugin~/Makefile
index b8c5bd9e4d31d9bf1c02d38f828c859c50f65716..30a7f6f3f83422eb9fadf3678c2d06a7199ac012 100644
--- a/externals/plugin~/Makefile
+++ b/externals/plugin~/Makefile
@@ -73,7 +73,7 @@ ORIGDIR=pd-$(LIBRARY_NAME:~=)_$(LIBRARY_VERSION)
UNAME := $(shell uname -s)
ifeq ($(UNAME),Darwin)
CPU := $(shell uname -p)
- ifeq ($(CPU),arm) # iPhone/iPod Touch
+ ifeq ($(CPU),arm-iphone) # iPhone/iPod Touch
SOURCES += $(SOURCES_iphoneos)
EXTENSION = pd_darwin
OS = iphoneos
diff --git a/externals/pmpd/Makefile b/externals/pmpd/Makefile
index c27189ee0771be22327e4741c0690dd30f3e7645..56cd3ae2daa4f422e365d4e2f9a1cfb978ef3c1f 100644
--- a/externals/pmpd/Makefile
+++ b/externals/pmpd/Makefile
@@ -82,7 +82,7 @@ ORIGDIR=pd-$(LIBRARY_NAME:~=)_$(LIBRARY_VERSION)
UNAME := $(shell uname -s)
ifeq ($(UNAME),Darwin)
CPU := $(shell uname -p)
- ifeq ($(CPU),arm) # iPhone/iPod Touch
+ ifeq ($(CPU),arm-iphone) # iPhone/iPod Touch
SOURCES += $(SOURCES_iphoneos)
EXTENSION = pd_darwin
SHARED_EXTENSION = dylib
diff --git a/externals/postlude/pluginhost~/Makefile b/externals/postlude/pluginhost~/Makefile
index e8a482ea05eb601f1007a7001c6dc2935dc842d5..e753d0d42e89cd75878a5c0dac7fada0ffff576b 100644
--- a/externals/postlude/pluginhost~/Makefile
+++ b/externals/postlude/pluginhost~/Makefile
@@ -87,7 +87,7 @@ ORIGDIR=pd-$(LIBRARY_NAME:~=)_$(LIBRARY_VERSION)
UNAME := $(shell uname -s)
ifeq ($(UNAME),Darwin)
CPU := $(shell uname -p)
- ifeq ($(CPU),arm) # iPhone/iPod Touch
+ ifeq ($(CPU),arm-iphone) # iPhone/iPod Touch
SOURCES += $(SOURCES_iphoneos)
EXTENSION = pd_darwin
SHARED_EXTENSION = dylib
diff --git a/externals/postlude/psql/Makefile b/externals/postlude/psql/Makefile
index 9be867ae86d05ef0d1c0ae923dcdd1085ca4104f..b2ee39f69fed340a27f066fb937fb19df57bf089 100644
--- a/externals/postlude/psql/Makefile
+++ b/externals/postlude/psql/Makefile
@@ -80,7 +80,7 @@ ORIGDIR=pd-$(LIBRARY_NAME:~=)_$(LIBRARY_VERSION)
UNAME := $(shell uname -s)
ifeq ($(UNAME),Darwin)
CPU := $(shell uname -p)
- ifeq ($(CPU),arm) # iPhone/iPod Touch
+ ifeq ($(CPU),arm-iphone) # iPhone/iPod Touch
SOURCES += $(SOURCES_iphoneos)
EXTENSION = pd_darwin
SHARED_EXTENSION = dylib
diff --git a/externals/sigpack/Makefile b/externals/sigpack/Makefile
index 820f5808e92c213e87775c5d89bb129b2625085e..09e00abbf99a78bbe279b48730f461c0a93b5f3a 100644
--- a/externals/sigpack/Makefile
+++ b/externals/sigpack/Makefile
@@ -78,7 +78,7 @@ ORIGDIR=pd-$(LIBRARY_NAME:~=)_$(LIBRARY_VERSION)
UNAME := $(shell uname -s)
ifeq ($(UNAME),Darwin)
CPU := $(shell uname -p)
- ifeq ($(CPU),arm) # iPhone/iPod Touch
+ ifeq ($(CPU),arm-iphone) # iPhone/iPod Touch
SOURCES += $(SOURCES_iphoneos)
EXTENSION = pd_darwin
SHARED_EXTENSION = dylib
diff --git a/externals/smlib/Makefile b/externals/smlib/Makefile
index 0a144146047ac3aae68a315c72b613fd7884d827..7d2f1a0ce4bc2f3738b92a8a89f0dce5e1e85bcb 100644
--- a/externals/smlib/Makefile
+++ b/externals/smlib/Makefile
@@ -71,7 +71,7 @@ ORIGDIR=pd-$(LIBRARY_NAME)_$(LIBRARY_VERSION)
UNAME := $(shell uname -s)
ifeq ($(UNAME),Darwin)
CPU := $(shell uname -p)
- ifeq ($(CPU),arm) # iPhone/iPod Touch
+ ifeq ($(CPU),arm-iphone) # iPhone/iPod Touch
SOURCES += $(SOURCES_iphoneos)
EXTENSION = pd_darwin
OS = iphoneos
diff --git a/externals/template/Makefile b/externals/template/Makefile
index 3d7330da74b28fe569bdaf56541ff542c7cbe5b2..7fa1a2bc968815dfe05092a615bb7819dc7fe507 100644
--- a/externals/template/Makefile
+++ b/externals/template/Makefile
@@ -68,7 +68,7 @@ ORIGDIR=pd-$(LIBRARY_NAME:~=)_$(LIBRARY_VERSION)
UNAME := $(shell uname -s)
ifeq ($(UNAME),Darwin)
CPU := $(shell uname -p)
- ifeq ($(CPU),arm) # iPhone/iPod Touch
+ ifeq ($(CPU),arm-iphone) # iPhone/iPod Touch
SOURCES += $(SOURCES_iphoneos)
EXTENSION = pd_darwin
OS = iphoneos
diff --git a/externals/unauthorized/Makefile b/externals/unauthorized/Makefile
index 6203ce2203b63e10e50f542ab725221931188596..f179cd770e2f0c2c94cbffa41e0d0aad08743cbf 100644
--- a/externals/unauthorized/Makefile
+++ b/externals/unauthorized/Makefile
@@ -85,7 +85,7 @@ ORIGDIR=pd-$(LIBRARY_NAME:~=)_$(LIBRARY_VERSION)
UNAME := $(shell uname -s)
ifeq ($(UNAME),Darwin)
CPU := $(shell uname -p)
- ifeq ($(CPU),arm) # iPhone/iPod Touch
+ ifeq ($(CPU),arm-iphone) # iPhone/iPod Touch
SOURCES += $(SOURCES_iphoneos)
EXTENSION = pd_darwin
SHARED_EXTENSION = dylib
diff --git a/externals/vbap/Makefile b/externals/vbap/Makefile
index 60d72110d1ab5ee148a5e009b2bc93cb65c3466d..9dd287f371af0e9f98296e3193b15e84b1053aee 100644
--- a/externals/vbap/Makefile
+++ b/externals/vbap/Makefile
@@ -82,7 +82,7 @@ ORIGDIR=pd-$(LIBRARY_NAME:~=)_$(LIBRARY_VERSION)
UNAME := $(shell uname -s)
ifeq ($(UNAME),Darwin)
CPU := $(shell uname -p)
- ifeq ($(CPU),arm) # iPhone/iPod Touch
+ ifeq ($(CPU),arm-iphone) # iPhone/iPod Touch
SOURCES += $(SOURCES_iphoneos)
EXTENSION = pd_darwin
SHARED_EXTENSION = dylib
diff --git a/externals/windowing/Makefile b/externals/windowing/Makefile
index a5e56ba94a2468a7e4673044ecb67eec28fbed28..ef7a8c07f23a97fda5dfebe7e9be93be79e4ce4f 100644
--- a/externals/windowing/Makefile
+++ b/externals/windowing/Makefile
@@ -69,7 +69,7 @@ ORIGDIR=pd-$(LIBRARY_NAME)_$(LIBRARY_VERSION)
UNAME := $(shell uname -s)
ifeq ($(UNAME),Darwin)
CPU := $(shell uname -p)
- ifeq ($(CPU),arm) # iPhone/iPod Touch
+ ifeq ($(CPU),arm-iphone) # iPhone/iPod Touch
SOURCES += $(SOURCES_iphoneos)
EXTENSION = pd_darwin
OS = iphoneos
diff --git a/packages/darwin_app/Makefile b/packages/darwin_app/Makefile
index b379c0d6f09af65f7d74a249d30d1873e7e806e1..fb5a4b6110892941d10a4b03b27114eb8eacbee1 100644
--- a/packages/darwin_app/Makefile
+++ b/packages/darwin_app/Makefile
@@ -40,7 +40,7 @@ ifeq ($(TARGET_PLATFORM),i386)
# assume Intel 64-bit with core2 as minimum CPU
OPT_CFLAGS += -march=core2 -msse3 -mssse3 -mfpmath=sse
else
- OPT_CFLAGS += -mcpu=7450 -mtune=7450
+# OPT_CFLAGS += -mcpu=7450 -mtune=7450
endif
OPT_FLAGS += -DDEBUG_SOUNDFILE