Compare revisions

7dc4f29c · 7dc4f29c · 7dc4f29c · 7dc4f29c · 7dc4f29c · 7dc4f29c
--- a/externals/apple/Makefile
+++ b/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
@@ -88,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
@@ -121,10 +125,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/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
@@ -101,9 +101,9 @@ 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 \
+    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/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
@@ -100,9 +100,9 @@ ifeq ($(UNAME),Darwin)
      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 

--- a/externals/autotune/README.txt
+++ b/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

--- 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
@@ -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/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
@@ -97,9 +97,9 @@ 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 \
+    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/bendinfix/Makefile.pdlibbuilder.revised
+++ b/externals/bendinfix/Makefile.pdlibbuilder.revised
@@ -523,7 +523,7 @@ ifeq ($(system), Darwin)
    /Applications/Pd-extended*.app/Contents/Resources/include/pdextended \
    /Applications/Pd*.app/Contents/Resources/src))
  extension = pd_darwin
-  cpp.flags := -DUNIX -DMACOSX -I /sw/include
+  cpp.flags := -DUNIX -DMACOSX
  c.flags := 
  c.ldflags := -undefined suppress -flat_namespace -bundle
  c.ldlibs := -lc

--- 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
@@ -102,8 +102,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/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
@@ -103,8 +103,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/build/darwin/makefile
+++ b/externals/build/darwin/makefile
@@ -33,8 +33,8 @@ OPTIM_FLAGS = -mpowerpc-gpopt -mcpu=750

 CFLAGS = -DPD -DUNIX -DMACOSX -Dunix $(OPTIM_FLAGS) \
    -Wall -W -Wno-unused -Wno-parentheses -Wno-switch -Wno-shadow 
-INCLUDES = -I$(pd_src)/src -I/sw/include
-LDFLAGS = -bundle  -bundle_loader $(PDEXECUTABLE) -L/sw/lib
+INCLUDES = -I$(pd_src)/src
+LDFLAGS = -bundle  -bundle_loader $(PDEXECUTABLE)

 externals: $(EXTERNALS:.c=.pd_darwin)


--- a/externals/creb/modules/bmatrix~.c
+++ b/externals/creb/modules/bmatrix~.c
@@ -77,7 +77,7 @@ static t_int *matrix_perform(t_int *w)
      memcpy(x, in, sizeof(t_float)*n);
      in = x;
    }
-  bzero(out, sizeof(t_float)*n); /* init output */
+  memset(out, 0, sizeof(t_float)*n); /* init output */

  for (j=0; j<n; j++)
      for (i=0; i<n; i++) 

--- a/externals/creb/modules/dwt~.c
+++ b/externals/creb/modules/dwt~.c
@@ -747,8 +747,8 @@ t_class *dwt_class, *idwt_class, *dwt16_class, *idwt16_class;

 static void dwt_reset(t_dwt *x)
 {
-  bzero(x->x_ctl.c_update, 16*sizeof(t_float));
-  bzero(x->x_ctl.c_predict, 16*sizeof(t_float));
+  memset(x->x_ctl.c_update, 0, 16*sizeof(t_float));
+  memset(x->x_ctl.c_predict, 0, 16*sizeof(t_float));

    x->x_ctl.c_update[7] = .25;
    x->x_ctl.c_update[8] = .25;

--- 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
@@ -105,8 +105,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/cxc/dist_normal.c
+++ b/externals/cxc/dist_normal.c
@@ -22,7 +22,7 @@ static int makeseed(void)
    return (random1_nextseed & 0x7fffffff);
 }

-static int rand_random_fl(seed) {
+static int rand_random_fl(unsigned int seed) {
  int q;
  double state;


--- a/externals/cxc/random1.c
+++ b/externals/cxc/random1.c
@@ -16,7 +16,7 @@
 #endif

 static int makeseed(void);
-static int rand_random1(int);
+static int rand_random1(unsigned int);

 static int makeseed(void)
 {
@@ -27,7 +27,7 @@ static int makeseed(void)

 /* -------------------------- random1 ------------------------------ */
 /* linear congruential generator.  Generator x[n+1] = a * x[n] mod m */
-static int rand_random1(seed)
+static int rand_random1(unsigned int seed)
 {
  int state;
  

--- a/externals/cxc/random1~.c
+++ b/externals/cxc/random1~.c
@@ -16,7 +16,7 @@
 #endif

 static int makeseed(void);
-static int rand_random1(int);
+static int rand_random1(unsigned int);

 static int makeseed(void)
 {
@@ -27,7 +27,7 @@ static int makeseed(void)

 /* -------------------------- random1 ------------------------------ */
 /* linear congruential generator.  Generator x[n+1] = a * x[n] mod m */
-static int rand_random1(seed)
+static int rand_random1(unsigned int seed)
 {
  int state;
  

--- a/externals/cxc/random_fl.c
+++ b/externals/cxc/random_fl.c
@@ -16,7 +16,7 @@
 #endif

 static int makeseed(void);
-static int rand_random_fl(int);
+static int rand_random_fl(unsigned int);

 static int makeseed(void)
 {
@@ -25,7 +25,7 @@ static int makeseed(void)
    return (random1_nextseed & 0x7fffffff);
 }

-static int rand_random_fl(seed) {
+static int rand_random_fl(unsigned int seed) {
  int q;
  double state;


--- a/externals/cxc/random_fl~.c
+++ b/externals/cxc/random_fl~.c
@@ -16,7 +16,7 @@
 #endif

 static int makeseed(void);
-static int rand_random_fl(int);
+static int rand_random_fl(unsigned int);

 static int makeseed(void)
 {
@@ -25,7 +25,7 @@ static int makeseed(void)
    return (random1_nextseed & 0x7fffffff);
 }

-static int rand_random_fl(seed) {
+static int rand_random_fl(unsigned int seed) {
  int q;
  double state;


--- a/externals/cxc/random_icg.c
+++ b/externals/cxc/random_icg.c
@@ -27,7 +27,7 @@ static int makeseed(void)
    return (random1_nextseed & 0x7fffffff);
 }

-static int rand_random_icg(seed, p)
+static int rand_random_icg(int seed, int p)
 {
  static int a, b, q, r;
  int state;
@@ -123,7 +123,7 @@ static void random_icg_bang(t_random_icg *x)
 {
  double nval;

-  x->x_state = rand_random_icg(x->x_state, x->x_p);
+  x->x_state = rand_random_icg(x->x_state, (int)x->x_p);

  nval = (((x->x_state / x->x_p) - 1) * (double)(x->x_g - x->x_f) + (double)x->x_f);


--- a/externals/cxc/random_icg~.c
+++ b/externals/cxc/random_icg~.c
@@ -26,7 +26,7 @@ static int makeseed(void)
    return (random1_nextseed & 0x7fffffff);
 }

-static int rand_random_icg(seed, p)
+static int rand_random_icg(int seed, int p)
 {
  static int a, b, q, r;
  int state;
@@ -115,7 +115,7 @@ static void random_icg_tilde_bang(t_random_icg_tilde *x)
 {
  double nval;

-  x->x_state = rand_random_icg(x->x_state, x->x_p);
+  x->x_state = rand_random_icg(x->x_state, (int)x->x_p);

  nval = (((x->x_state / x->x_p) - 1) * (double)(x->x_g - x->x_f) + (double)x->x_f);
No results found