""

svn path=/trunk/; revision=1025

15 files changed, 131 insertions, 68 deletions

diff --git a/externals/grill/dyn/build-pd-linux.sh b/externals/grill/dyn/build-pd-linux.sh
index 421cb6e1..413650f7 100644
--- a/externals/grill/dyn/build-pd-linux.sh
+++ b/externals/grill/dyn/build-pd-linux.sh
@@ -4,7 +4,7 @@
 
 make -f makefile.pd-linux &&
 { 
-	if [ ${INSTPATH} != "" ]; then
+	if [ $INSTPATH != "" ]; then
 		echo Now install as root
 		su -c "make -f makefile.pd-linux install"
 	fi
diff --git a/externals/grill/dyn/config-pd-linux.txt b/externals/grill/dyn/config-pd-linux.txt
index 9afaa255..8cb605be 100644
--- a/externals/grill/dyn/config-pd-linux.txt
+++ b/externals/grill/dyn/config-pd-linux.txt
@@ -12,7 +12,7 @@
 # (the normal header file doesn't work as g_canvas.h is not there)
 # please note that currently the development branch (e.g devel_0_36) is needed
 # 
-PDPATH=/home/thomas/prog/pd-devel/src
+PDPATH=/usr/src/pd-0.37-0/src
 
 # where do the flext libraries reside?
 FLEXTPATH=/usr/local/lib/pd/flext
@@ -22,11 +22,14 @@ TARGDIR=./pd-linux
 
 # where should the external be installed?
 # (leave blank to omit installation)
-#INSTPATH=/usr/local/lib/pd/extra
+INSTPATH=/usr/local/lib/pd/extra
 
 
 # additional compiler flags
 # (check if they fit for your system!)
-UFLAGS=-mcpu=pentiumpro  # gcc 2.95
+# UFLAGS=-mcpu=pentiumpro  # gcc 2.95
 # UFLAGS=-mcpu=pentium3 -msse  # gcc 3.2
 
+# define for shared build
+#FLEXT_SHARED=1
+
diff --git a/externals/grill/dyn/makefile.pd-linux b/externals/grill/dyn/makefile.pd-linux
index 45c25f6c..3e858f1b 100644
--- a/externals/grill/dyn/makefile.pd-linux
+++ b/externals/grill/dyn/makefile.pd-linux
@@ -16,15 +16,31 @@ CONFIG=config-pd-linux.txt
 
 include $(CONFIG)
 
-FLEXTLIB=$(FLEXTPATH)/flext.a
 
 # compiler+linker stuff	
 INCLUDES=$(PDPATH) 
 LIBPATH=
-FLAGS=-DFLEXT_SYS=2 ${U_FLAGS}
-CFLAGS=-O6 
-#CFLAGS=-g
-LIBS=m util 
+FLAGS=-DFLEXT_SYS=2 
+CFLAGS=-O2 $(UFLAGS) 
+LIBS=stdc++ 
+
+
+ifdef FLEXT_SHARED
+CFLAGS+=-shared -DFLEXT_SHARED
+LDFLAGS+=-L $(FLEXTPATH)
+LIBFLEXT=-lflext
+
+ifeq ($(CXX),icc)
+LDFLAGS+=-i_dynamic
+else
+LDFLAGS+=-Wl,-Bdynamic
+endif
+
+else
+
+LIBFLEXT=$(FLEXTPATH)/libflext.a
+
+endif
 
 
 # ---------------------------------------------
@@ -43,21 +59,22 @@ TARGET=$(TARGDIR)/$(NAME).pd_linux
 # default target
 all: $(TARGDIR) $(TARGET)
 
-$(patsubst %,$(DIR)/%,$(SRCS)): $(patsubst %,$(DIR)/%,$(HDRS)) $(FLEXTLIB) $(CONFIG)
+$(patsubst %,$(DIR)/%,$(SRCS)): $(patsubst %,$(DIR)/%,$(HDRS)) $(MAKEFILE) $(CONFIG)
 	touch $@
 
 $(TARGDIR):
-	mkdir $(TARGDIR)
+	-mkdir $(TARGDIR)
 
 $(TARGDIR)/%.o : $(DIR)/%.cpp
 	$(CXX) -c $(CFLAGS) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(FLEXTPATH)) $< -o $@
 
-$(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.o,$(SRCS)) $(FLEXTLIB) 
-	$(CXX) -shared $^ $(patsubst %,-L%,$(LIBPATH)) $(patsubst %,-l%,$(LIBS)) -o $@ 
+$(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.o,$(SRCS))  
+	$(CXX) -shared $(LDFLAGS) -o $@ $^ $(LIBFLEXT) $(patsubst %,-L%,$(LIBPATH)) $(patsubst %,-l%,$(LIBS))  
+	strip --strip-unneeded $@	
 	chmod 755 $@
 
 $(INSTPATH):
-	mkdir $(INSTPATH)
+	-mkdir $(INSTPATH)
 
 install:: $(INSTPATH)
 
diff --git a/externals/grill/fftease/config-pd-linux.txt b/externals/grill/fftease/config-pd-linux.txt
index 4a7b085a..7599bb50 100644
--- a/externals/grill/fftease/config-pd-linux.txt
+++ b/externals/grill/fftease/config-pd-linux.txt
@@ -9,7 +9,6 @@
 
 # your c/c++ compilers (define only if not gcc/g++)
 # CC=gcc
-# CXX=g++
 
 # where are the PD header files?
 # leave it blank if it is a system directory (like /usr/local/include), 
@@ -28,7 +27,9 @@ INSTPATH=/usr/local/lib/pd/extra
 
 # additional compiler flags
 # (check if they fit for your system!)
-UFLAGS=-mcpu=pentiumpro  # gcc 2.95
+# UFLAGS=-mcpu=pentiumpro  # gcc 2.95
 # UFLAGS=-mcpu=pentium3 -msse  # gcc 3.2
 
+# define for shared build
+# FLEXT_SHARED=1
 
diff --git a/externals/grill/fftease/makefile.pd-linux b/externals/grill/fftease/makefile.pd-linux
index 8f2361ab..5982626c 100644
--- a/externals/grill/fftease/makefile.pd-linux
+++ b/externals/grill/fftease/makefile.pd-linux
@@ -17,15 +17,31 @@ CONFIG=config-pd-linux.txt
 
 include $(CONFIG)
 
-FLEXTLIB=$(FLEXTPATH)/flext.a
-
 # compiler+linker stuff	
 INCLUDES=$(PDPATH) 
 LIBPATH=
-FLAGS=-DFLEXT_SYS=2 -fno-exceptions -fno-rtti ${UFLAGS}
-CFLAGS=-O6 
-#CFLAGS=-g
-LIBS=m util 
+FLAGS=-DFLEXT_SYS=2 
+CFLAGS=-O2 $(UFLAGS) 
+LIBS=stdc++ 
+
+ifdef FLEXT_SHARED
+CFLAGS+=-shared -DFLEXT_SHARED
+LDFLAGS+=-L $(FLEXTPATH)
+LIBFLEXT=-lflext
+
+ifeq ($(CXX),icc)
+LDFLAGS+=-i_dynamic
+else
+LDFLAGS+=-Wl,-Bdynamic
+endif
+
+else
+
+LIBFLEXT=$(FLEXTPATH)/libflext.a
+
+endif
+
+
 
 
 # ---------------------------------------------
@@ -44,20 +60,21 @@ DIR=src
 # default target
 all: $(TARGDIR) $(TARGET)
 
-$(patsubst %,$(DIR)/%,$(SRCS)): $(patsubst %,$(DIR)/%,$(HDRS)) $(FLEXTLIB) $(MAKEFILE) $(CONFIG)
+$(patsubst %,$(DIR)/%,$(SRCS)): $(patsubst %,$(DIR)/%,$(HDRS)) $(MAKEFILE) $(CONFIG)
 	touch $@
 
 $(TARGDIR):
 	mkdir $(TARGDIR)
 
 $(TARGDIR)/%.o : $(DIR)/%.cpp
-	$(CXX) -c $(CFLAGS) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(FLEXTPATH)) $< -o $@
+	$(CC) -c $(CFLAGS) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(FLEXTPATH)) $< -o $@
 
 $(TARGDIR)/%.co : $(DIR)/%.c
 	$(CC) -c $(CFLAGS) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(FLEXTPATH)) $< -o $@
 
-$(TARGET) : $(patsubst %.c,$(TARGDIR)/%.co,$(patsubst %.cpp,$(TARGDIR)/%.o,$(SRCS))) $(FLEXTLIB) 
-	$(CXX) -shared $^ -Wl,-s $(patsubst %,-L%,$(LIBPATH)) $(patsubst %,-l%,$(LIBS)) -o $@ 
+$(TARGET) : $(patsubst %.c,$(TARGDIR)/%.co,$(patsubst %.cpp,$(TARGDIR)/%.o,$(SRCS)))  
+	$(CC) $(LDFLAGS) -shared -o $@ $^ $(LIBFLEXT) $(patsubst %,-l%,$(LIBS)) 
+	strip --strip-unneeded $@ 
 	chmod 755 $@
 
 $(INSTPATH):
diff --git a/externals/grill/flext/config-pd-darwin.txt b/externals/grill/flext/config-pd-darwin.txt
index 1fa58fb9..91e59edd 100644
--- a/externals/grill/flext/config-pd-darwin.txt
+++ b/externals/grill/flext/config-pd-darwin.txt
@@ -26,8 +26,3 @@ INSTDIR=/usr/local/lib/pd/flext
 # additional compiler flags
 # (check if they fit for your system!)
 UFLAGS=-DFLEXT_USE_SIMD -malign-power -maltivec -faltivec
-
-# define to use old library naming for backwards compatibility
-# ("flext.a" instead of new "libflext.a" etc.)
-V4_NAMING=1
-
diff --git a/externals/grill/flext/flext.cw b/externals/grill/flext/flext.cw
index 60cdd1eb..5810f001 100644
--- a/externals/grill/flext/flext.cw
+++ b/externals/grill/flext/flext.cw
diff --git a/externals/grill/flext/makefile.pd-darwin b/externals/grill/flext/makefile.pd-darwin
index d431a010..a8bb24be 100644
--- a/externals/grill/flext/makefile.pd-darwin
+++ b/externals/grill/flext/makefile.pd-darwin
@@ -14,12 +14,25 @@ include ${CONFIG}
 
 # compiler+linker stuff 
 INCLUDES=${PDPATH}
-FLAGS=-DFLEXT_SYS=2 -Wno-unused -Wno-parentheses -Wno-switch -Wstrict-prototypes
-FLAGS+=${UFLAGS}
-CFLAGS=-O6 
+FLAGS=-DFLEXT_SYS=2 ${UFLAGS}
+
+# compiler flags for optimized build
+CFLAGS=-O2
+
+# compiler flags for debug build
 CFLAGS_D=-g
+
+# additional flags for threading
 CFLAGS_T=-DFLEXT_THREADS
-LIBS=gcc 
+
+# additional flags for shared library
+CFLAGS_S=-DFLEXT_SHARED -DFLEXT_EXPORTS
+
+# flags for shared linking
+LSHFLAGS= -dylib -dynamic -flat_namespace -undefined suppress
+
+# frameworks
+FRAMEWORKS=Carbon veclib
 
 
 # ----------------------------------------------
@@ -28,7 +41,7 @@ LIBS=gcc
 
 NAME=flext
 
-SRCDIR=source
+SRCDIR=./source
 
 # all the source files from the package
 include make-files.txt
@@ -45,24 +58,17 @@ SRCS+=$(SRCS_STK)
 HDRS+=$(HDRS_STK)
 endif
 
-# for FLEXT_USE_SIMD
-CFLAGS+=-framework Carbon -framework veclib -Fveclib -FCarbon
 
 MAKEFILE=makefile.pd-darwin
-ifndef V4_NAMING
+
 TARGET=$(TARGDIR)/lib$(NAME).a
 TARGET_D=$(TARGDIR)/lib$(NAME)_d.a
 TARGET_T=$(TARGDIR)/lib$(NAME)_t.a
 TARGET_TD=$(TARGDIR)/lib$(NAME)_td.a
-else
-TARGET=$(TARGDIR)/$(NAME).a
-TARGET_D=$(TARGDIR)/$(NAME)_d.a
-TARGET_T=$(TARGDIR)/$(NAME)_t.a
-TARGET_TD=$(TARGDIR)/$(NAME)_td.a
-endif
 TARGET_S=$(TARGDIR)/lib$(NAME).dylib
 TARGET_SD=$(TARGDIR)/lib$(NAME)_d.dylib
 
+
 all: $(TARGDIR) $(TARGET) $(TARGET_D) $(TARGET_T) $(TARGET_TD)   $(TARGET_S) $(TARGET_SD)
 
 $(TARGDIR):
@@ -72,22 +78,22 @@ $(patsubst %,$(SRCDIR)/%,$(SRCS)): $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(patsubst
 	touch $@
 
 $(TARGDIR)/%.o : $(SRCDIR)/%.cpp
-	$(CXX) -c -dynamic $(CFLAGS) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@
+	$(CXX) -c -dynamic $(CFLAGS) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $(patsubst %,-F%,$(FRAMEWORKS)) $< -o $@
 
 $(TARGDIR)/%.do : $(SRCDIR)/%.cpp
-	$(CXX) -c -dynamic $(CFLAGS_D) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@
+	$(CXX) -c -dynamic $(CFLAGS_D) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $(patsubst %,-F%,$(FRAMEWORKS)) $< -o $@
 
 $(TARGDIR)/%.to : $(SRCDIR)/%.cpp
-	$(CXX) -c -dynamic $(CFLAGS) $(CFLAGS_T) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@
+	$(CXX) -c -dynamic $(CFLAGS) $(CFLAGS_T) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $(patsubst %,-F%,$(FRAMEWORKS)) $< -o $@
 
 $(TARGDIR)/%.tdo : $(SRCDIR)/%.cpp
-	$(CXX) -c -dynamic $(CFLAGS_D) $(CFLAGS_T) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@
+	$(CXX) -c -dynamic $(CFLAGS_D) $(CFLAGS_T) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $(patsubst %,-F%,$(FRAMEWORKS)) $< -o $@
 
 $(TARGDIR)/%.so : $(SRCDIR)/%.cpp
-	$(CXX) -c -dynamic $(CFLAGS) $(CFLAGS_T) $(FLAGS) -DFLEXT_SHARED $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@
+	$(CXX) -c -dynamic $(CFLAGS) $(CFLAGS_T)  $(CFLAGS_S) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $(patsubst %,-F%,$(FRAMEWORKS)) $< -o $@
 
-$(TARGDIR)/%.sdo : $(SRCDIR)/%.cpp
-	$(CXX) -c -dynamic $(CFLAGS_D) $(CFLAGS_T) $(FLAGS) -DFLEXT_SHARED $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@
+$(TARGDIR)/%.sdo : $(SRCDIR)/%.cpp 
+	$(CXX) -c -dynamic $(CFLAGS_D) $(CFLAGS_T)  $(CFLAGS_S) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $(patsubst %,-F%,$(FRAMEWORKS)) $< -o $@
 
 $(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.o,$(SRCS)) 
 	libtool -static -o $@ $^
@@ -102,10 +108,10 @@ $(TARGET_TD) : $(patsubst %.cpp,$(TARGDIR)/%.tdo,$(SRCS))
 	libtool -static -o $@ $^
 
 $(TARGET_S) : $(patsubst %.cpp,$(TARGDIR)/%.so,$(SRCS))
-	ld -dylib -dynamic -flat_namespace -undefined suppress -lgcc -lstdc++ -ldylib1.o -o $@ $^
+	ld $(LSHFLAGS) -o $@ $^ -ldylib1.o -lgcc -lstdc++ $(patsubst %,-framework %,$(FRAMEWORKS)) 
 
 $(TARGET_SD) : $(patsubst %.cpp,$(TARGDIR)/%.sdo,$(SRCS))
-	ld -dylib -dynamic -flat_namespace -undefined suppress -lgcc -lstdc++ -ldylib1.o -o $@ $^
+	ld $(LSHFLAGS) -o $@ $^ -ldylib1.o -lgcc -lstdc++ $(patsubst %,-framework %,$(FRAMEWORKS)) 
 
 .PHONY: clean install
 
@@ -123,6 +129,10 @@ install:: $(TARGET) $(TARGET_D) $(TARGET_T) $(TARGET_TD) $(TARGET_S) $(TARGET_SD
 	cp $^ $(INSTDIR)
 	mv $(INSTDIR)/lib*.dylib /usr/local/lib
 	ranlib $(INSTDIR)/*.a  # have to rerun ranlib at install dir ?!
+	
+	#make compatibility links for old-style naming
+	for i in $(foreach f,$(notdir $(filter %.a,$^)),$(patsubst lib%.a,%,$(f))); do rm -f $(INSTDIR)/$$i.a && ln -sf lib$$i.a $(INSTDIR)/$$i.a; done 
+
 #	chmod 755 $(patsubst %,$(INSTDIR)/%,$(notdir $^))
 #	chgrp admin $(patsubst %,$(INSTDIR)/%,$(notdir $^))
 
diff --git a/externals/grill/flext/makefile.pd-linux b/externals/grill/flext/makefile.pd-linux
index a5a3e241..7e77f7f4 100644
--- a/externals/grill/flext/makefile.pd-linux
+++ b/externals/grill/flext/makefile.pd-linux
@@ -144,6 +144,9 @@ endif
 
 install:: $(TARGET) $(TARGET_D) $(TARGET_T) $(TARGET_TD) $(TARGET_S) $(TARGET_SD)  $(patsubst %,$(SRCDIR)/%,$(HDRS))
 	cp $^ $(INSTDIR)
+
+	#make compatibility links for old-style naming
 	for i in $(foreach f,$(notdir $(filter %.a,$^)),$(patsubst lib%.a,%,$(f))); do rm -f $(INSTDIR)/$$i.a && ln -sf lib$$i.a $(INSTDIR)/$$i.a; done 
+
 	chmod a+r $(patsubst %,$(INSTDIR)/%,$(notdir $^))
 	chown root.users $(patsubst %,$(INSTDIR)/%,$(notdir $^))
diff --git a/externals/grill/py/config-pd-linux.txt b/externals/grill/py/config-pd-linux.txt
index 16f65f6e..5b02d4f8 100644
--- a/externals/grill/py/config-pd-linux.txt
+++ b/externals/grill/py/config-pd-linux.txt
@@ -27,5 +27,5 @@ TARGDIR=./pd-linux
 # (leave blank to omit installation)
 INSTPATH=/usr/local/lib/pd/extra
 
-
-
+# define for shared build
+#FLEXT_SHARED=1
diff --git a/externals/grill/py/makefile.pd-linux b/externals/grill/py/makefile.pd-linux
index 0c90892f..01c4b9c2 100644
--- a/externals/grill/py/makefile.pd-linux
+++ b/externals/grill/py/makefile.pd-linux
@@ -12,15 +12,31 @@ CONFIG=config-pd-linux.txt
 
 include $(CONFIG)
 
-FLEXTLIB=$(FLEXTPATH)/flext_t.a
 
 # compiler+linker stuff	
 INCLUDES=$(PDPATH) $(PYTHONINCLUDE)
 LIBPATH=$(PYTHONLIB)
 FLAGS=-DFLEXT_SYS=2 -DFLEXT_THREADS
-CFLAGS=-O6 -mcpu=pentiumpro
-#CFLAGS=-g
-LIBS=m util python$(PYTHONVER)  
+CFLAGS=-O2 $(UFLAGS)
+LIBS=stdc++ python$(PYTHONVER)  
+
+
+ifdef FLEXT_SHARED
+CFLAGS+=-shared -DFLEXT_SHARED
+LIBPATH+=$(FLEXTPATH)
+LIBFLEXT=-lflext
+
+ifeq ($(CXX),icc)
+LDFLAGS+=-i_dynamic
+else
+LDFLAGS+=-Wl,-Bdynamic
+endif
+
+else
+
+LIBFLEXT=$(FLEXTPATH)/libflext_t.a
+
+endif
 
 
 # ---------------------------------------------
@@ -37,21 +53,22 @@ TARGET=$(TARGDIR)/$(NAME).pd_linux
 # default target
 all: $(TARGDIR) $(TARGET)
 
-$(patsubst %,$(SRCDIR)/%,$(SRCS)): $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(FLEXTLIB) $(CONFIG)
+$(patsubst %,$(SRCDIR)/%,$(SRCS)): $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(MAKEFILE) $(CONFIG)
 	touch $@
 
 $(TARGDIR):
-	mkdir $(TARGDIR)
+	-mkdir $(TARGDIR)
 
 $(TARGDIR)/%.o : $(SRCDIR)/%.cpp
 	$(CXX) -c $(CFLAGS) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(FLEXTPATH)) $< -o $@
 
-$(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.o,$(SRCS)) $(FLEXTLIB) 
-	$(CXX) -shared $^ $(patsubst %,-L%,$(LIBPATH)) $(patsubst %,-l%,$(LIBS)) -o $@ 
+$(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.o,$(SRCS))  
+	$(CXX) -shared $(LDFLAGS) -o $@ $^ $(patsubst %,-L%,$(LIBPATH)) $(LIBFLEXT) $(patsubst %,-l%,$(LIBS)) 
+	strip --strip-unneeded $@ 
 	chmod 755 $@
 
 $(INSTPATH):
-	mkdir $(INSTDIR)
+	-mkdir $(INSTDIR)
 
 install:: $(INSTDIR)
 
diff --git a/externals/grill/xsample/config-pd-darwin.txt b/externals/grill/xsample/config-pd-darwin.txt
index 175a9b4b..418da47d 100755
--- a/externals/grill/xsample/config-pd-darwin.txt
+++ b/externals/grill/xsample/config-pd-darwin.txt
@@ -3,7 +3,7 @@
 #
 
 # your c++ compiler (if not g++)
-CXX=g++-3.3
+#CXX=g++-3.3
 
 # where does the PD installation reside?
 PD=/usr/local/lib/pd
diff --git a/externals/grill/xsample/makefile.pd-darwin b/externals/grill/xsample/makefile.pd-darwin
index ac182d27..f501daea 100755
--- a/externals/grill/xsample/makefile.pd-darwin
+++ b/externals/grill/xsample/makefile.pd-darwin
@@ -13,12 +13,12 @@ CONFIG=config-pd-darwin.txt
 
 include ${CONFIG}
 
-FLEXTLIB=$(FLEXTPATH)/flext.a
+FLEXTLIB=$(FLEXTPATH)/libflext.a
 
 # compiler stuff
 INCLUDES=$(PDINC) 
 FLAGS=-DFLEXT_SYS=2
-CFLAGS=${UFLAGS} -dynamic -O6 -Wno-unused -Wno-parentheses -Wno-switch -Wstrict-prototypes -funroll-loops -fmove-all-movables -frerun-loop-opt -fno-rtti -fno-exceptions  
+CFLAGS=${UFLAGS} -dynamic -O2 -Wno-unused -Wno-parentheses -Wno-switch -Wstrict-prototypes -funroll-loops -fmove-all-movables -frerun-loop-opt -fno-rtti -fno-exceptions  
 LIBS=m gcc
 LDFLAGS=$(FLEXTLIB) -bundle -bundle_loader $(PDBIN)
 FRAMEWORKS=Carbon veclib
diff --git a/externals/grill/xsample/maxmsp/xrecord~.help b/externals/grill/xsample/maxmsp/xrecord~.help
index ea025eed..3d2db8b0 100644
--- a/externals/grill/xsample/maxmsp/xrecord~.help
+++ b/externals/grill/xsample/maxmsp/xrecord~.help
diff --git a/externals/grill/xsample/xsample.cw b/externals/grill/xsample/xsample.cw
index 37c42ad7..f18d3a83 100755
--- a/externals/grill/xsample/xsample.cw
+++ b/externals/grill/xsample/xsample.cw