externals/OSCx/libOSC/Makefile

-#CFLAGS=  -O2 -Wall -fPIC
-ARFLAGS=srv
-# uncomment the following for linux/win
-# DEFS= -Dunix
-LIB=libOSC.a
-
-CFLAGS=-g -O2 -DUNIX -Wall -Wimplicit -Wunused -Wmissing-prototypes -O2 -fPIC -I../libOSC -I../../pd/src -I../../../pd/src -I../src
-INCLUDES=-I../libOSC -I../../pd/src -I../../../pd/src -I../src
-
-LIBOBJS= ${LIB}(OSC-client.o) ${LIB}(OSC-timetag.o)
-
-all:	${LIBOBJS}
-
-.c.a:
-	${CC} -c ${CFLAGS} ${INCLUDES} ${DEFS} $<
-	${AR} ${ARFLAGS} $@ $*.o
-	rm -f $*.o
-
-test_OSC: test_OSC.o ${LIB}
-	$(CC) -o test_OSC test_OSC.o ${LIB}
-
-test_OSC_timeTag: test_OSC_timeTag.o OSC-timetag.o
-	$(CC) -o test_OSC_timeTag test_OSC_timeTag.o  OSC-timetag.o
-
-
-clean:
-	rm -f ${LIB} *.o

externals/OSCx/libOSC/OSC-client.c

@@ -52,10 +52,11 @@ MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 #define DONE 4         /* All open bundles have been closed, so can't write 
 		          anything else */
 
+#include <stdio.h>
+
 #ifdef WIN32
 	#include	<winsock2.h>
 	#include 	<io.h>    
-	#include 	<stdio.h>    
 	#include 	<errno.h>
 	#include 	<fcntl.h>
 	#include 	<sys/types.h>
@@ -68,7 +69,6 @@ MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 
 #ifdef unix
   #include <netinet/in.h>
-  #include <stdio.h>
 #endif
 	
 #include "OSC-client.h"

externals/OSCx/libOSC/OSC-timetag.c

@@ -50,7 +50,7 @@ OSCTimeTag OSCTT_BiggestPossibleTimeTag(void) {
 OSCTimeTag OSCTT_PlusSeconds(OSCTimeTag original, float secondsOffset) {
     int8 offset = (int8) (secondsOffset * TWO_TO_THE_32_FLOAT);
 
-/*    printf("* OSCTT_PlusSeconds %llx plus %f seconds (i.e., %lld offset) is %llx\n", original,
+/*    printf("* OSCTT_PlusSeconds %zx plus %f seconds (i.e., %lld offset) is %zx\n", original,
 	      secondsOffset, offset, original + offset);  */
 
     return original + offset;
@@ -58,7 +58,7 @@ OSCTimeTag OSCTT_PlusSeconds(OSCTimeTag original, float secondsOffset) {
 
 int OSCTT_Compare(OSCTimeTag left, OSCTimeTag right) {
 #if 0
-    printf("***** OSCTT_Compare(%llx, %llx): %d\n", left, right,
+    printf("***** OSCTT_Compare(%zx, %zx): %d\n", left, right,
 	   (left<right) ? -1 : ((left == right) ? 0 : 1));
 #endif
     if (left < right) {
@@ -107,7 +107,7 @@ OSCTimeTag OSCTT_CurrentTime(void) {
 
     result += usecOffset;
 
-/*    printf("* OSCTT_CurrentTime is %llx\n", result); */
+/*    printf("* OSCTT_CurrentTime is %zx\n", result); */
     return result;
 }
 

externals/OSCx/libOSC/test_OSC.c

@@ -108,7 +108,7 @@ main() {
 
     printf("Testing time tags\n");
     tt = OSCTT_CurrentTime();
-    printf("Time now is %llx\n", tt);
+    printf("Time now is %zx\n", tt);
 
     printf("Testing bundles\n");
     if (OSC_openBundle(b, tt)) {

externals/OSCx/libOSC/test_OSC_timeTag.c

@@ -22,15 +22,15 @@ main() {
     OSCTimeTag now, later;
 
     now = OSCTT_CurrentTime();
-    printf("Now it's %llu (0x%llx)\n", now, now);
+    printf("Now it's %llu (0x%zx)\n", now, now);
 
-    printf("Immediately would be %llu (0x%llx)\n", OSCTT_Immediately(),
+    printf("Immediately would be %llu (0x%zx)\n", OSCTT_Immediately(),
 	   OSCTT_Immediately());
 
     later = OSCTT_PlusSeconds(now, 1.0f);
-    printf("One second from now would be %llu (0x%llx)\n", later, later);
+    printf("One second from now would be %llu (0x%zx)\n", later, later);
 
     now = OSCTT_CurrentTime();
-    printf("And *now* it's %llu (0x%llx)\n", now, now);
+    printf("And *now* it's %llu (0x%zx)\n", now, now);
 }
 

externals/OSCx/send+dump/Makefile

-LIBS = -lc -lm
-LIBOSCDIR = ../libOSC
-LIBOSC = ${LIBOSCDIR}/libOSC.a
-
-# strange bug requires this...
-CFLAGS= -g -O2 -DUNIX -Wall -Wimplicit -Wunused -Wmissing-prototypes -O2 -fPIC -I../libOSC -I../../pd/src -I../../../pd/src -I../src -I../libOSC -I../../pd/src -I../../../pd/src -I../src
-# INCLUDES= -I../libOSC -I../../pd/src -I../../../pd/src -I../src
-
-DUMPOBJS=dumpOSC.o
-
-
-both: sendOSC dumpOSC
-
-sendOSC: sendOSC.o htmsocket.o ${LIBOSC}
-	${CC} ${CFLAGS} $(INCLUDES) -o sendOSC sendOSC.o htmsocket.o $(LIBS) ${LIBOSC}
-
-dumpOSC: ${DUMPOBJS}
-	${CC} ${CFLAGS} $(INCLUDES) -o $@ ${DUMPOBJS} $(LIBS)
-
-dumpUDP: dumpUDP.o
-	${CC} ${CFLAGS} $(INCLUDES) -o dumpUDP dumpUDP.o $(LIBS)
-
-${LIBOSC}:
-	echo "You need to go to " ${LIBOSCDIR} " and do a make."
-	(cd ../libOSC ; make)
-
-clean:
-	rm -f sendOSC dumpOSC *.o
-
-

externals/OSCx/send+dump/dumpOSC.c

@@ -138,7 +138,7 @@ static int unixinitudp(int chan)
 	if((sockfd = socket(AF_UNIX, SOCK_DGRAM, 0)) < 0)
 			return sockfd;
 	
-	bzero((char *)&serv_addr, sizeof(serv_addr));
+	memset((char *)&serv_addr, 0, sizeof(serv_addr));
 	serv_addr.sun_family = AF_UNIX;
 	strcpy(serv_addr.sun_path, UNIXDG_PATH);
 	sprintf(serv_addr.sun_path+strlen(serv_addr.sun_path), "%d", chan);
@@ -160,7 +160,7 @@ static int initudp(int chan)
 	
 	if((sockfd = socket(AF_INET, SOCK_DGRAM, 0)) < 0)
 			return sockfd;
-	bzero((char *)&serv_addr, sizeof(serv_addr));
+	memset((char *)&serv_addr, 0, sizeof(serv_addr));
 	serv_addr.sin_family = AF_INET;
 	serv_addr.sin_addr.s_addr = htonl(INADDR_ANY);
 	serv_addr.sin_port = htons(chan);

externals/OSCx/send+dump/dumpUDP.c

@@ -92,7 +92,7 @@ static int initudp(int port) {
 	
 	if((sockfd = socket(AF_INET, SOCK_DGRAM, 0)) < 0)
 			return sockfd;
-	bzero((char *)&serv_addr, sizeof(serv_addr));
+	memset((char *)&serv_addr, 0, sizeof(serv_addr));
 	serv_addr.sin_family = AF_INET;
 	serv_addr.sin_addr.s_addr = htonl(INADDR_ANY);
 	serv_addr.sin_port = htons(port);

externals/OSCx/send+dump/htmsocket.c

@@ -133,7 +133,7 @@ void *OpenHTMSocket(char *host, int portnumber)
 		         * server that we want to send to.
 		*/
 		
-		bzero((char *) &o->userv_addr, sizeof(o->userv_addr));
+		memset((char *) &o->userv_addr, 0, sizeof(o->userv_addr));
 		       o->userv_addr.sun_family = AF_UNIX;
 		strcpy(o->userv_addr.sun_path, UNIXDG_PATH);
 			sprintf(o->userv_addr.sun_path+strlen(o->userv_addr.sun_path), "%d", portnumber);
@@ -152,7 +152,7 @@ void *OpenHTMSocket(char *host, int portnumber)
 			 * pathname, based on our process id.
 			 */
 		
-			bzero((char *) &ucl_addr, sizeof(ucl_addr));    /* zero out */
+			memset((char *) &ucl_addr, 0, sizeof(ucl_addr));    /* zero out */
 			ucl_addr.sun_family = AF_UNIX;
 			strcpy(ucl_addr.sun_path, UNIXDG_TMP);
 
@@ -183,7 +183,7 @@ void *OpenHTMSocket(char *host, int portnumber)
 		#ifdef WIN32
 			ZeroMemory((char *)&o->serv_addr, sizeof(o->serv_addr));
 		#else
-			bzero((char *)&o->serv_addr, sizeof(o->serv_addr));
+			memset((char *)&o->serv_addr, 0, sizeof(o->serv_addr));
 		#endif
 
 		o->serv_addr.sin_family = AF_INET;
@@ -243,7 +243,7 @@ void *OpenHTMSocket(char *host, int portnumber)
 			o->serv_addr.sin_port = htons(portnumber);
 			o->addr = &(o->serv_addr);
 			if((sockfd = socket(AF_INET, SOCK_DGRAM, 0)) >= 0) {
-					bzero((char *)&cl_addr, sizeof(cl_addr));
+					memset((char *)&cl_addr, 0, sizeof(cl_addr));
 				cl_addr.sin_family = AF_INET;
 				cl_addr.sin_addr.s_addr = htonl(INADDR_ANY);
 				cl_addr.sin_port = htons(0);

externals/OSCx/send+dump/sendOSC.c

@@ -302,7 +302,7 @@ OSCTimeTag ParseTimeTag(char *s) {
     if (isdigit(*p) || (*p >= 'a' && *p <='f') || (*p >= 'A' && *p <='F')) {
 	/* They specified the 8-byte tag in hex */
 	OSCTimeTag tt;
-	if (sscanf(p, "%llx", &tt) != 1) {
+	if (sscanf(p, "%zx", &tt) != 1) {
 	    complain("warning: couldn't parse time tag %s\n", s);
 	    return OSCTT_Immediately();
 	}

externals/OSCx/src/Makefile

-#
-# Copyright (C) 2004 Hans-Christoph Steiner
-#
-#    This program is free software; you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation; either version 2 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program; if not, write to the Free Software
-#    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-
-EXT=o
-LIBS = -lc -lm
-LIBOSC = ../libOSC/libOSC.a
-
-CFLAGS = -g -O2 -DUNIX -Wall -Wimplicit -Wunused -Wmissing-prototypes -O2 -fPIC -I../libOSC -I../../pd/src -I../../../pd/src -I../src
-INCLUDES = -I../libOSC -I../../pd/src -I../../../pd/src -I../src
-LDFLAGS = -Wl,--export-dynamic -shared
-
-prefix=/usr/local
-
-SOURCES = OSC-pattern-match.c OSC.c dumpOSC.c htmsocket.c OSCroute.c sendOSC.c OSC-system-dependent.c
-TARGETS = $(SOURCES:.c=.o)
-EXTS=sendOSC.pd_linux dumpOSC.pd_linux OSCroute.pd_linux
-
-# ----------------------- autoconf -----------------------
-
-all: $(EXTS)
-
-lib: OSC.pd_linux
-
-dumpOSC.pd_linux: dumpOSC.o
-	$(CC) $(LDFLAGS) -o dumpOSC.pd_linux $? $(LIBS)
-
-sendOSC.pd_linux: sendOSC.o htmsocket.o OSC-system-dependent.o
-	$(CC) $(LDFLAGS) -o sendOSC.pd_linux $? $(LIBS) $(LIBOSC)
-
-OSCroute.pd_linux: OSCroute.o OSC-pattern-match.o OSC-system-dependent.o
-	$(CC) $(LDFLAGS) -o OSCroute.pd_linux $? $(LIBS)
-
-OSC.pd_linux: OSC.o sendOSC.o dumpOSC.o OSCroute.o htmsocket.o OSC-pattern-match.o OSC-system-dependent.o
-	$(CC) $(LDFLAGS) -o OSC.pd_linux $? $(LIBS) $(LIBOSC)
-
-$(TARGETS): %.o : %.c
-	$(CC) $(CFLAGS) $(INCLUDES) -c -o $*.o $*.c
-
-# ----------------------------------------------------------
-
-install-doc:
-	@test -d $(prefix)/lib/pd/doc/5.reference || mkdir -p $(prefix)/lib/pd/doc/5.reference
-	cp -r ../doc/* $(prefix)/lib/pd/doc/5.reference/
-
-install: install-doc
-	@test -d $(prefix)/lib/pd/extra || mkdir -p $(prefix)/lib/pd/extra
-	install -m644 *.pd_linux $(prefix)/lib/pd/extra
-
-clean:
-	rm -rf *.$(EXT) *.pd_linux

externals/OSCx/src/Makefile.in

@@ -21,7 +21,7 @@ LIBS = @LIBS@
 LIBOSC = ../libOSC/@LIBOSC@
 
 CFLAGS = @CFLAGS@
-INCLUDES = @INCLUDES@
+INCLUDES = @INCLUDES@ -I/usr/include/tirpc
 LDFLAGS = @LDFLAGS@
 
 prefix=@prefix@

externals/OSCx/src/dumpOSC.c

@@ -313,7 +313,7 @@ static void *dumpOSC_new(t_symbol *compatflag,
       int t = 1;
 	  mreq.imr_multiaddr.s_addr = inet_addr(castgroup->s_name);
 	  mreq.imr_interface.s_addr = htonl(INADDR_ANY);
-      if (setsockopt(sockfd,SOL_SOCKET,SO_REUSEADDR,&t,sizeof(t)) < 0) {
+      if (setsockopt(sockfd,SOL_SOCKET,SO_REUSEADDR,(char*)&t,sizeof(t)) < 0) {
 		  sys_sockerror("setsockopt");
       }
 	  if (setsockopt(sockfd,IPPROTO_IP,IP_ADD_MEMBERSHIP,(char*)&mreq,sizeof(mreq)) < 0) {
@@ -400,7 +400,7 @@ void dumpOSC_setup(void)
 		if((sockfd = socket(AF_UNIX, SOCK_DGRAM, 0)) < 0)
 				return sockfd;
 		
-		bzero((char *)&serv_addr, sizeof(serv_addr));
+		memset((char *)&serv_addr, 0, sizeof(serv_addr));
 		serv_addr.sun_family = AF_UNIX;
 		strcpy(serv_addr.sun_path, UNIXDG_PATH);
 		sprintf(serv_addr.sun_path+strlen(serv_addr.sun_path), "%d", chan);
@@ -448,7 +448,7 @@ static int initudp(int chan)
 	if((sockfd = socket(AF_INET, SOCK_DGRAM, 0)) < 0)
 			return sockfd;
 
-	bzero((char *)&serv_addr, sizeof(serv_addr));
+	memset((char *)&serv_addr, 0, sizeof(serv_addr));
 	serv_addr.sin_family = AF_INET;
 	serv_addr.sin_addr.s_addr = htonl(INADDR_ANY);
 	serv_addr.sin_port = htons(chan);

externals/OSCx/src/htmsocket.c

@@ -154,7 +154,7 @@ void *OpenHTMSocket(char *host, int portnumber, short *multicast_TTL)
 		         * server that we want to send to.
 		*/
 		
-		bzero((char *) &o->userv_addr, sizeof(o->userv_addr));
+		memset((char *) &o->userv_addr, 0, sizeof(o->userv_addr));
 		       o->userv_addr.sun_family = AF_UNIX;
 		strcpy(o->userv_addr.sun_path, UNIXDG_PATH);
 			sprintf(o->userv_addr.sun_path+strlen(o->userv_addr.sun_path), "%d", portnumber);
@@ -173,7 +173,7 @@ void *OpenHTMSocket(char *host, int portnumber, short *multicast_TTL)
 			 * pathname, based on our process id.
 			 */
 		
-			bzero((char *) &ucl_addr, sizeof(ucl_addr));    /* zero out */
+			memset((char *) &ucl_addr, 0, sizeof(ucl_addr));    /* zero out */
 			ucl_addr.sun_family = AF_UNIX;
 			strcpy(ucl_addr.sun_path, UNIXDG_TMP);
 
@@ -204,7 +204,7 @@ void *OpenHTMSocket(char *host, int portnumber, short *multicast_TTL)
 		#ifdef WIN32
 			ZeroMemory((char *)&o->serv_addr, sizeof(o->serv_addr));
 		#else
-			bzero((char *)&o->serv_addr, sizeof(o->serv_addr));
+			memset((char *)&o->serv_addr, 0, sizeof(o->serv_addr));
 		#endif
 
 		o->serv_addr.sin_family = AF_INET;
@@ -290,7 +290,7 @@ void *OpenHTMSocket(char *host, int portnumber, short *multicast_TTL)
 			o->serv_addr.sin_port = htons(portnumber);
 			o->addr = &(o->serv_addr);
 			if((sockfd = socket(AF_INET, SOCK_DGRAM, 0)) >= 0) {
-					bzero((char *)&cl_addr, sizeof(cl_addr));
+					memset((char *)&cl_addr, 0, sizeof(cl_addr));
 				cl_addr.sin_family = AF_INET;
 				cl_addr.sin_addr.s_addr = htonl(INADDR_ANY);
 				cl_addr.sin_port = htons(0);

externals/apple/Makefile

@@ -10,7 +10,11 @@ SOURCES =
 
 # For objects that only build on certain platforms, add those to the SOURCES
 # line for the right platforms.
-SOURCES_macosx = ambient_light_sensor.c iodisplay.c keyboard_light.c sudden_motion_sensor.c smc.c keyboard_layout.c
+#
+# For some reason keyboard_layout.c doesn't work anymore. Even searching for
+# some of the system function calls used returns zero results. So we disable
+# building it below.
+SOURCES_macosx = ambient_light_sensor.c iodisplay.c keyboard_light.c sudden_motion_sensor.c smc.c #keyboard_layout.c
 SOURCES_iphoneos = multitouch.c
 
 # list all pd objects (i.e. myobject.pd) files here, and their helpfiles will
@@ -53,6 +57,10 @@ ALL_LIBS =
 #
 #------------------------------------------------------------------------------#
 
+ifeq ($(macos_target),)
+macos_target = 10.9
+endif
+
 # these can be set from outside without (usually) breaking the build
 CFLAGS = -Wall -W -g
 LDFLAGS =
@@ -84,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
@@ -112,15 +120,15 @@ ifeq ($(UNAME),Darwin)
     OPT_CFLAGS = -ftree-vectorize -ftree-vectorizer-verbose=2 -fast
 # 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
+      FAT_FLAGS = -arch ppc -arch i386 -mmacosx-version-min=$(macos_target)
     else
-      FAT_FLAGS = -arch ppc -arch i386 -arch x86_64 -mmacosx-version-min=10.4
+      FAT_FLAGS = -arch ppc -arch i386 -arch x86_64 -mmacosx-version-min=$(macos_target)
       SOURCES += $(SOURCES_iphoneos)
     endif
-    ALL_CFLAGS += $(FAT_FLAGS) -fPIC -I/sw/include
+    ALL_CFLAGS += $(FAT_FLAGS) -fPIC
     # 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
+    ALL_LDFLAGS += $(FAT_FLAGS) -bundle $(BUNDLE_LOADER) -undefined dynamic_lookup
     SHARED_LDFLAGS += $(FAT_FLAGS) -dynamiclib -undefined dynamic_lookup \
 	-install_name @loader_path/$(SHARED_LIB) -compatibility_version 1 -current_version 1.0
     ALL_LIBS += -lc $(LIBS_macosx)
@@ -260,7 +268,7 @@ all: $(SOURCES:.c=.$(EXTENSION)) $(SHARED_LIB)
 
 multitouch.$(EXTENSION): multitouch.c
 	$(CC) $(ALL_CFLAGS) -o multitouch.o -c multitouch.c
-	$(CC) $(ALL_LDFLAGS) -mmacosx-version-min=10.5 -F/System/Library/PrivateFrameworks \
+	$(CC) $(ALL_LDFLAGS) -mmacosx-version-min=$(macos_target) -F/System/Library/PrivateFrameworks \
 		-o multitouch.$(EXTENSION) multitouch.o $(ALL_LIBS) \
 		-framework MultitouchSupport
 	chmod a-x multitouch.$(EXTENSION)

externals/arraysize/Makefile

@@ -40,6 +40,10 @@ EXTRA_DIST =
 #
 #------------------------------------------------------------------------------#
 
+ifeq ($(macos_target),)
+macos_target = 10.9
+endif
+
 # get library version from meta file
 LIBRARY_VERSION = $(shell sed -n 's|^\#X text [0-9][0-9]* [0-9][0-9]* VERSION \(.*\);|\1|p' $(LIBRARY_NAME)-meta.pd)
 
@@ -68,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
@@ -92,14 +96,14 @@ ifeq ($(UNAME),Darwin)
     OPT_CFLAGS = -ftree-vectorize -ftree-vectorizer-verbose=2 -fast
 # 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
+      FAT_FLAGS = -arch ppc -arch i386 -mmacosx-version-min=$(macos_target)
     else
-      FAT_FLAGS = -arch ppc -arch i386 -arch x86_64 -mmacosx-version-min=10.4
+      FAT_FLAGS = -arch ppc -arch i386 -arch x86_64 -mmacosx-version-min=$(macos_target)
       SOURCES += $(SOURCES_iphoneos)
     endif
-    CFLAGS += $(FAT_FLAGS) -fPIC -I/sw/include \
+    CFLAGS += $(FAT_FLAGS) -fPIC \
       -I/Applications/Pd-extended.app/Contents/Resources/include
-    LDFLAGS += $(FAT_FLAGS) -bundle -undefined dynamic_lookup -L/sw/lib
+    LDFLAGS += $(FAT_FLAGS) -bundle -undefined dynamic_lookup
     # if the 'pd' binary exists, check the linking against it to aid with stripping
     LDFLAGS += $(shell test -e $(PD_PATH)/bin/pd && echo -bundle_loader $(PD_PATH)/bin/pd)
     LIBS += -lc 

externals/autotune/Makefile

@@ -40,6 +40,10 @@ SOURCES_windows =
 #
 #------------------------------------------------------------------------------#
 
+ifeq ($(macos_target),)
+macos_target = 10.9
+endif
+
 # get library version from meta file
 #LIBRARY_VERSION = $(shell sed -n 's|^\#X text [0-9][0-9]* [0-9][0-9]* VERSION \(.*\);|\1|p' $(LIBRARY_NAME)-meta.pd)
 LIBRARY_VERSION = 0.9
@@ -66,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
@@ -91,14 +95,14 @@ ifeq ($(UNAME),Darwin)
     OPT_CFLAGS = -ftree-vectorize -ftree-vectorizer-verbose=2 -fast
 # 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 i386 -mmacosx-version-min=10.4
+      FAT_FLAGS = -arch i386 -mmacosx-version-min=$(macos_target)
     else
-      FAT_FLAGS = -arch i386 -arch x86_64 -mmacosx-version-min=10.4
+      FAT_FLAGS = -arch i386 -arch x86_64 -mmacosx-version-min=$(macos_target)
       SOURCES += $(SOURCES_iphoneos)
     endif
-    CFLAGS += $(FAT_FLAGS) -fPIC -I/sw/include \
+    CFLAGS += $(FAT_FLAGS) -fPIC \
       -I/Applications/Pd-extended.app/Contents/Resources/include
-    LDFLAGS += $(FAT_FLAGS) -bundle -undefined dynamic_lookup -L/opt/local/lib
+    LDFLAGS += $(FAT_FLAGS) -bundle -undefined dynamic_lookup
     # if the 'pd' binary exists, check the linking against it to aid with stripping
     LDFLAGS += $(shell test -e $(PD_PATH)/bin/pd && echo -bundle_loader $(PD_PATH)/bin/pd)
     LIBS += -lc 

externals/autotune/README.txt

 An auto-tuning PD External, based on 
 autotalent an auto-tuning LADSPA plugin and an older port by Maxus Germanus
 
-Free software by Thomas A. Baran.
-http://web.mit.edu/tbaran/www/autotune.html
-VERSION 0.2
+Autotalent v0.2
+Free software (GPLv2) by Thomas A. Baran.
+http://tombaran.info/autotalent.html
 
 Ivica Ico Bukvic <ico.bukvic.net>
 VERSION 0.9.1

externals/autotune/autotune~.c

@@ -547,7 +547,7 @@ void autotune_dsp(t_autotune *x, t_signal **sp, short *count)
 	
 	if(x->fs != sp[0]->s_sr)  autotune_init(x, sp[0]->s_sr);
 	
-	dsp_add(autotune_perform, 4, x, sp[0]->s_vec, sp[1]->s_vec, sp[0]->s_n);
+	dsp_add(autotune_perform, 4, x, sp[0]->s_vec, sp[1]->s_vec, (t_int)sp[0]->s_n);
 }
 
 

externals/bassemu~/Makefile

@@ -41,6 +41,10 @@ LIBS =
 #
 #------------------------------------------------------------------------------#
 
+ifeq ($(macos_target),)
+macos_target = 10.9
+endif
+
 # get library version from meta file
 LIBRARY_VERSION = $(shell sed -n 's|^\#X text [0-9][0-9]* [0-9][0-9]* VERSION \(.*\);|\1|p' $(LIBRARY_NAME)-meta.pd)
 
@@ -67,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
@@ -92,13 +96,13 @@ ifeq ($(UNAME),Darwin)
     OPT_CFLAGS = -ftree-vectorize -ftree-vectorizer-verbose=2 -fast
 # 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
+      FAT_FLAGS = -arch ppc -arch i386 -mmacosx-version-min=$(macos_target)
     else
-      FAT_FLAGS = -arch ppc -arch i386 -arch x86_64 -mmacosx-version-min=10.4
+      FAT_FLAGS = -arch ppc -arch i386 -arch x86_64 -mmacosx-version-min=$(macos_target)
       SOURCES += $(SOURCES_iphoneos)
     endif
-    CFLAGS += $(FAT_FLAGS) -fPIC -I/sw/include
-    LDFLAGS += $(FAT_FLAGS) -bundle -undefined dynamic_lookup -L/sw/lib
+    CFLAGS += $(FAT_FLAGS) -fPIC
+    LDFLAGS += $(FAT_FLAGS) -bundle -undefined dynamic_lookup
     # if the 'pd' binary exists, check the linking against it to aid with stripping
     LDFLAGS += $(shell test -e $(PD_PATH)/bin/pd && echo -bundle_loader $(PD_PATH)/bin/pd)
     LIBS += -lc