From 28fc489e79e10932c93a98950531f4a9b34c45cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Albert=20Gr=C3=A4f?= <aggraef@gmail.com>
Date: Mon, 5 Dec 2022 05:08:54 +0100
Subject: [PATCH] M1 fixes - fix up external Makefiles.
Specifically, we disable the branches which attempt to detect iOS
cross compilation by checking for a Darwin system with arm cpu
architecture. With Apple Silicon Macs this test is now broken, since
an M1/M2 Mac would be detected as an iOS target.
For now, we skip this check by looking for a non-existent arm-iphone
architecture. This should be fine since currently we don't support iOS
anyway, and AFAIK Purr Data has never been tested there. If we want to
revive iOS cross compilation at some point, we'll have to devise a
check which will do the right thing on both iOS and macOS arm devices.
---
externals/apple/Makefile | 2 +-
externals/arraysize/Makefile | 2 +-
externals/autotune/Makefile | 2 +-
externals/bassemu~/Makefile | 2 +-
externals/beatpipe/Makefile | 2 +-
externals/boids/Makefile | 2 +-
externals/bsaylor/Makefile | 2 +-
externals/cxc/Makefile | 2 +-
externals/deprecated/Makefile | 2 +-
externals/earplug~/Makefile | 2 +-
externals/ekext/Makefile | 2 +-
externals/ext13/Makefile | 2 +-
externals/ezfile/Makefile | 2 +-
externals/fftease/Makefile | 2 +-
externals/freeverb~/Makefile | 2 +-
externals/ggee/Makefile | 2 +-
externals/hcs/Makefile | 2 +-
externals/hcs/usbhid/Makefile | 2 +-
externals/iem/comport/comport/Makefile | 2 +-
externals/iem/iemguts/Makefile | 2 +-
externals/iem/iemnet/Makefile | 2 +-
externals/iem/syslog/Makefile | 2 +-
externals/import/Makefile | 2 +-
externals/io/sixaxis/Makefile | 2 +-
externals/io/xbee/Makefile | 2 +-
externals/loaders/libdir/Makefile | 2 +-
externals/lyonpotpourri/Makefile | 2 +-
externals/mapping/Makefile | 2 +-
externals/markex/Makefile | 2 +-
externals/maxlib/Makefile | 2 +-
externals/miXed/cyclone/Makefile.libdir | 2 +-
externals/mjlib/Makefile | 2 +-
externals/moonlib/Makefile | 2 +-
externals/motex/Makefile | 2 +-
externals/mrpeach/Makefile | 2 +-
externals/mrpeach/cmos/Makefile | 2 +-
externals/mrpeach/net/Makefile | 2 +-
externals/mrpeach/osc/Makefile | 2 +-
externals/mrpeach/sqosc~/sqosc~.c | 1 +
externals/nusmuk/lightboard/Makefile | 2 +-
externals/nusmuk/linear-cue-system/Makefile | 2 +-
externals/nusmuk/nusmuk-audio/Makefile | 2 +-
externals/nusmuk/nusmuk-utils/Makefile | 2 +-
externals/nusmuk/puremapping/Makefile | 2 +-
externals/pan/Makefile | 2 +-
externals/pddp/Makefile | 2 +-
externals/pdogg/Makefile | 2 +-
externals/plugin~/Makefile | 2 +-
externals/pmpd/Makefile | 2 +-
externals/postlude/pluginhost~/Makefile | 2 +-
externals/postlude/psql/Makefile | 2 +-
externals/sigpack/Makefile | 2 +-
externals/smlib/Makefile | 2 +-
externals/template/Makefile | 2 +-
externals/unauthorized/Makefile | 2 +-
externals/vbap/Makefile | 2 +-
externals/windowing/Makefile | 2 +-
packages/darwin_app/Makefile | 2 +-
58 files changed, 58 insertions(+), 57 deletions(-)
diff --git a/externals/apple/Makefile b/externals/apple/Makefile
index bed1837ec..b902d0ddb 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 3805e8414..51340073b 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 ed41cb625..4699cb375 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 00d2eb420..d410aee13 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 cd2c30c08..08cfd9ce9 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 ad0e4d1e0..07416a052 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 e60e961d3..a0f75b2e7 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 61fbc3c9b..e42a53d3b 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 ba76cc59c..fdad97921 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 63b068396..339ef7213 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 322c51622..b3dfbead2 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 3ca4e4f7e..c6029f67b 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 858cef591..4b7c252ec 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 d58a63a6a..36eebfbda 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 c5bc5dd49..6c4b338c6 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 1dea6b62c..a9fe4d6c5 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 cf2ec2dc8..421a81520 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 62830c9f9..c59922c7a 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 b4640e070..d69f91dc4 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 d0112bc68..7be684eef 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 8e396c1c2..2fd8b7bf6 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 aea5c7f66..001002926 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 42985284b..493378c3b 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 0252b65cc..16df4ac19 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 61d037446..8aa838d20 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 2ccebd773..5146d924f 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 85a240b8b..19977248f 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 81f2a72f2..317247671 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 1d1031d0f..70761d257 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 437f27c5d..92dcaa614 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 08b15a49b..7812c36f0 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 85e2d8d2c..fbd3274a7 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 79c9c70e1..bbb465e71 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 711e7e64f..fb2932bcb 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 027550c58..7839cdf4d 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 10b93de7e..e04c3741e 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 fafcbf8f5..ecf007a02 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 cf0962402..224ccd318 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 d4f8b35be..5dac4a361 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 9869e2a0d..0669d357f 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 548c6baed..ef7ba69b4 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 f00519a42..d431d4e15 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 4f8c6ca2b..fe2121594 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 66023afee..544eac661 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 60f52792f..30979e43b 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 5709fbaed..cd61c1391 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 1be2ac87e..7cb9e9102 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 b8c5bd9e4..30a7f6f3f 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 c27189ee0..56cd3ae2d 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 e8a482ea0..e753d0d42 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 9be867ae8..b2ee39f69 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 820f5808e..09e00abbf 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 0a1441460..7d2f1a0ce 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 3d7330da7..7fa1a2bc9 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 6203ce220..f179cd770 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 60d72110d..9dd287f37 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 a5e56ba94..ef7a8c07f 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 b379c0d6f..fb5a4b611 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
--
GitLab