Compare revisions

7dc4f29c · 7dc4f29c · 7dc4f29c · 7dc4f29c · 7dc4f29c · 7dc4f29c
--- a/externals/iemlib/iemlib2/src/dollarg.c
+++ b/externals/iemlib/iemlib2/src/dollarg.c
@@ -8,6 +8,8 @@ iemlib2 written by Thomas Musil, Copyright (c) IEM KUG Graz Austria 2000 - 2006
 # include "g_canvas.h"
 #else
 EXTERN t_canvas *glist_getcanvas(t_glist *x);
+EXTERN void canvas_unsetcurrent(t_canvas *x);
+EXTERN void canvas_setcurrent(t_canvas *x);
 #endif
 #include "iemlib.h"


--- a/externals/iemlib/iemlib2/src/protect_against_open.c
+++ b/externals/iemlib/iemlib2/src/protect_against_open.c
@@ -110,7 +110,7 @@ void protect_against_open_setup(void)
  protect_against_open_widgetbehavior.w_selectfn = NULL;
  protect_against_open_widgetbehavior.w_activatefn = NULL;
  protect_against_open_widgetbehavior.w_deletefn = NULL;
-  protect_against_open_widgetbehavior.w_visfn = protect_against_open_vis;
+  protect_against_open_widgetbehavior.w_visfn = (t_method)protect_against_open_vis;
  protect_against_open_widgetbehavior.w_clickfn = NULL;
 #if defined(PD_MAJOR_VERSION) && (PD_MINOR_VERSION >= 37)


--- 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
@@ -97,8 +97,8 @@ ifeq ($(UNAME),Darwin)
      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
-    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 

--- a/externals/io/hidio/HID_Utilities_Source/HID_Config_Utilities.c
+++ b/externals/io/hidio/HID_Utilities_Source/HID_Config_Utilities.c
@@ -82,7 +82,7 @@ unsigned char HIDConfigureAction (pRecDevice * ppDevice, pRecElement * ppElement
 		pDevice = HIDGetNextDevice (pDevice);
 	}
 	saveValueArray = (long *) malloc (sizeof (long) * numDevices * maxElements); // 2D array to save values
-	bzero(saveValueArray,sizeof (long) * numDevices * maxElements); // clear array
+	memset(saveValueArray,0,sizeof (long) * numDevices * maxElements); // clear array

 	// store current values
 	deviceNum = 0;
@@ -168,7 +168,7 @@ void HIDSaveElementConfig (FILE * fileRef, pRecDevice pDevice, pRecElement pElem
 	if (HIDIsValidElement(pDevice,pElement))
 	{
 		// clear rec
-		bzero(&saveRec,sizeof(recSaveHID));
+		memset(&saveRec,0,sizeof(recSaveHID));

 		saveRec.actionCookie = actionCookie;


--- a/externals/io/hidio/HID_Utilities_Source/HID_Utilities.c
+++ b/externals/io/hidio/HID_Utilities_Source/HID_Utilities.c
@@ -290,7 +290,7 @@ static void hid_AddElement (CFTypeRef refElement, pRecElement * ppElementCurrent
 		// it preserves the structure of the lements as collections have children and elements are siblings to each other

 		// clear record
-		bzero(pElement,sizeof(recElement));
+		memset(pElement,0,sizeof(recElement));

 		// get element info
        pElement->type = elementType;
@@ -587,7 +587,7 @@ static pRecDevice hid_BuildDevice (io_object_t hidDevice)
        kern_return_t result = IORegistryEntryCreateCFProperties (hidDevice, &hidProperties, kCFAllocatorDefault, kNilOptions);

 		// clear record
-		bzero(pDevice, sizeof(recDevice));
+		memset(pDevice, 0, sizeof(recDevice));

        if ((result == KERN_SUCCESS) && (NULL != hidProperties))
        {

--- a/externals/io/hidio/autogen.sh
+++ b/externals/io/hidio/autogen.sh
 #!/bin/sh

-PATH=/sw/bin:$PATH
-
 case `uname -s` in
    MINGW*)
 # autoreconf doesn't always work on MinGW

--- 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
@@ -79,9 +79,9 @@ ifeq ($(UNAME),Darwin)
    OS = macosx
    OPT_CFLAGS = -ftree-vectorize -ftree-vectorizer-verbose=2 -fast
    FAT_FLAGS = -arch i386 -arch ppc -mmacosx-version-min=10.4
-    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 

--- 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
@@ -79,9 +79,9 @@ ifeq ($(UNAME),Darwin)
    OS = macosx
    OPT_CFLAGS = -ftree-vectorize -ftree-vectorizer-verbose=2 -fast
    FAT_FLAGS = -arch i386 -arch ppc -mmacosx-version-min=10.4
-    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 

--- 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
@@ -101,8 +101,8 @@ ifeq ($(UNAME),Darwin)
      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 

--- a/externals/loaders/libdir/libdir.c
+++ b/externals/loaders/libdir/libdir.c
@@ -59,7 +59,7 @@ static int libdir_add_to_path(const char*dirbuf, t_canvas*canvas) {
  return 0;
 }

-static int libdir_loader_legacy(t_canvas *canvas, char *classname)
+static int libdir_loader_legacy(t_canvas *canvas, const char *classname, const char *path)
 {
    int fd = -1;
    char fullclassname[FILENAME_MAX], dirbuf[FILENAME_MAX];

--- 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
@@ -124,7 +124,7 @@ ifeq ($(UNAME),Darwin)
        FAT_FLAGS = -arch ppc -arch i386 -arch x86_64 -mmacosx-version-min=$(macos_target)
      endif
    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) -headerpad_max_install_names -bundle $(BUNDLE_LOADER) \

--- a/externals/lyonpotpourri/bashfest~.c
+++ b/externals/lyonpotpourri/bashfest~.c
@@ -936,7 +936,7 @@ void bashfest_copy_to_MSP_buffer(t_bashfest *x, int slot)
 }
 void bashfest_deploy_dsp(t_bashfest *x)
 {
-    float *b_samples = x->b_samples;
+    float *b_samples = (float*)x->b_samples;
    long b_nchans = x->b_nchans;
    long b_frames = x->b_frames;
    t_event *events = x->events;

--- a/externals/lyonpotpourri/sarec~.c
+++ b/externals/lyonpotpourri/sarec~.c
@@ -351,7 +351,7 @@ void sarec_attach_buffer(t_sarec *x)
 	t_garray *a; 
 	t_symbol *bufname = x->bufname;
 	int b_frames;
-	float *b_samples = x->b_samples;
+	t_word *b_samples = x->b_samples;
 	if (!(a = (t_garray *)pd_findbyclass(bufname, garray_class))) {
 		if (*bufname->s_name) pd_error(x, "%s: %s: no such array",OBJECT_NAME,bufname->s_name);
        x->b_valid = 0;
@@ -397,4 +397,4 @@ void sarec_dsp(t_sarec *x, t_signal **sp)
    
 	dsp_addv(sarec_perform, pointer_count, (t_int *) sigvec);
 	free(sigvec);	
-}
\ No newline at end of file
+}
--- a/externals/lyonpotpourri/sel~.c
+++ b/externals/lyonpotpourri/sel~.c
@@ -45,7 +45,7 @@ void *sel_new(t_symbol *msg, short argc, t_atom *argv)
        outlet_new(&x->x_obj, gensym("signal"));
    }
    
-	x->matches = (t_double *) malloc(x->length * sizeof(double));
+	x->matches = (t_float *) malloc(x->length * sizeof(t_float));

 	for(i = 0; i < argc; i++){
 		x->matches[i] = (double)atom_getfloatarg(i,argc,argv);
@@ -97,7 +97,7 @@ t_int *sel_perform(t_int *w)
    
    // clean each outlet
 	for(j = 0; j < length; j++){
-		match_outlet = (t_double *) outs[j];
+		match_outlet = (t_float *) outs[j];
 		for(i = 0; i < n; i++){
 			match_outlet[i] = 0.0;
 		}
@@ -107,7 +107,7 @@ t_int *sel_perform(t_int *w)
 		if(inlet[i]){
 			for(j = 0; j < length; j++){
 				if( inlet[i] == matches[j]){
-					match_outlet = (t_double *) outs[j];
+					match_outlet = (t_float *) outs[j];
 					match_outlet[i] = 1.0; // always send a unity click
 				}
 			}

--- a/externals/lyonpotpourri/shoehorn~.c
+++ b/externals/lyonpotpourri/shoehorn~.c
@@ -16,7 +16,7 @@ typedef struct _shoehorn
    double pio2;
    t_float *inarr;
    t_float **loc_invecs;
-    t_float *outs;
+    t_float **outs;
    double advFrac;
    double *pangains1;
    double *pangains2;

--- 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
@@ -101,8 +101,8 @@ ifeq ($(UNAME),Darwin)
      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 

--- 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
@@ -111,10 +111,10 @@ ifeq ($(UNAME),Darwin)
      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)

--- 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
@@ -120,11 +120,11 @@ ifeq ($(UNAME),Darwin)
        FAT_FLAGS = -arch ppc -arch i386 -arch x86_64 -mmacosx-version-min=$(macos_target)
      endif
    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) -headerpad_max_install_names -bundle $(BUNDLE_LOADER) \
-	-undefined dynamic_lookup -L/sw/lib
+	-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)

--- a/externals/maxlib/chord.c
+++ b/externals/maxlib/chord.c
@@ -25,9 +25,7 @@
 #include "m_pd.h"
 #include <stdio.h>
 #include <string.h>
-#ifndef _WIN32
 #include <stdlib.h>
-#endif


 #define MAX_POLY 32                 /* maximum number of notes played at a time */

--- 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
@@ -46,8 +46,8 @@ ifeq ($(UNAME),Darwin)
    else
      FAT_FLAGS = -arch ppc -arch i386 -arch x86_64 -mmacosx-version-min=$(macos_target)
    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-l2ork && echo -bundle_loader $(PD_PATH)/bin/pd-l2ork)
    LIBS += -lc
No results found