3 files changed, 25 insertions, 14 deletions
diff --git a/externals/grill/dyn/config-pd-darwin.txt b/externals/grill/dyn/config-pd-darwin.txt
index d993e9e4..7494d33b 100644
--- a/externals/grill/dyn/config-pd-darwin.txt
+++ b/externals/grill/dyn/config-pd-darwin.txt
@@ -11,7 +11,7 @@
 # where are the PD header files?
 # leave it blank if it is a system directory (like /usr/local/include), 
 # 	since gcc 3.2 complains about it
-PDPATH=/usr/src/pd-0.37-0/src
+PDPATH=../../../pd/src
 
 # where is the PD executable?
 PD=/usr/local/bin/pd
@@ -26,7 +26,10 @@ TARGDIR=./pd-darwin
 # (leave blank to omit installation)
 INSTPATH=/usr/local/lib/pd/extra
 
-
 # additional compiler flags
 # (check if they fit for your system!)
-UFLAGS=-maltivec -faltivec
+UFLAGS=-malign-power -maltivec -faltivec
+
+# build with a shared flext library
+FLEXT_SHARED=1
+
diff --git a/externals/grill/dyn/make-files.txt b/externals/grill/dyn/make-files.txt
index 81d7cbdc..0538f6b7 100644
--- a/externals/grill/dyn/make-files.txt
+++ b/externals/grill/dyn/make-files.txt
@@ -1,3 +1,5 @@
+NAME=dyn~
+
 # all the source files from the package
 DIR=src
 
diff --git a/externals/grill/dyn/makefile.pd-darwin b/externals/grill/dyn/makefile.pd-darwin
index 2294d4a5..f7588e29 100644
--- a/externals/grill/dyn/makefile.pd-darwin
+++ b/externals/grill/dyn/makefile.pd-darwin
@@ -16,25 +16,31 @@ CONFIG=config-pd-darwin.txt
 
 include $(CONFIG)
 
-FLEXTLIB=$(FLEXTPATH)/flext.a
-
 # compiler+linker stuff	
 INCLUDES=$(PDPATH) 
 LIBPATH=
-FLAGS=-DFLEXT_SYS=2 ${U_FLAGS}
-CFLAGS=-O2 -Wno-unused -Wno-parentheses -Wno-switch -Wstrict-prototypes -fno-rtti
-#CFLAGS=-g
+FLAGS=-DFLEXT_SYS=2 
+CFLAGS=-O2 ${UFLAGS} -Wno-unused -Wno-parentheses -Wno-switch -Wstrict-prototypes
 LIBS=m
 FRAMEWORKS=vecLib
-LDFLAGS=-bundle -bundle_loader $(PD)
+LDFLAGS+=-Wl,-x -Wl,-S -bundle -bundle_loader $(PD)
+
+ifdef FLEXT_SHARED
+CFLAGS+=-DFLEXT_SHARED
+LDFLAGS+=-L$(FLEXTPATH)
+FLEXTLIB=-lflext
+
+else
+
+FLEXTLIB=$(FLEXTPATH)/libflext.a
+
+endif
 
 
 # ---------------------------------------------
 # the rest can stay untouched
 # ----------------------------------------------
 
-NAME=dyn~
-
 # all the source files from the package
 include make-files.txt
 
@@ -43,7 +49,7 @@ TARGET=$(TARGDIR)/$(NAME).pd_darwin
 # default target
 all: $(TARGDIR) $(TARGET)
 
-$(patsubst %,$(DIR)/%,$(SRCS)): $(patsubst %,$(DIR)/%,$(HDRS)) $(FLEXTLIB) $(CONFIG)
+$(patsubst %,$(DIR)/%,$(SRCS)): $(patsubst %,$(DIR)/%,$(HDRS)) $(CONFIG)
 	touch $@
 
 $(TARGDIR):
@@ -52,8 +58,8 @@ $(TARGDIR):
 $(TARGDIR)/%.o : $(DIR)/%.cpp
 	$(CXX) -c $(CFLAGS) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(FLEXTPATH)) $< -o $@
 
-$(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.o,$(SRCS)) $(FLEXTLIB) 
-	$(CXX) $(LDFLAGS) $^ $(patsubst %,-L%,$(LIBPATH)) $(patsubst %,-l%,$(LIBS)) $(patsubst %,-framework %,$(FRAMEWORKS)) -o $@ 
+$(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.o,$(SRCS)) 
+	$(CXX) $(LDFLAGS) $^ $(patsubst %,-L%,$(LIBPATH)) $(patsubst %,-l%,$(LIBS)) $(patsubst %,-framework %,$(FRAMEWORKS)) $(FLEXTLIB) -o $@ 
 	chmod 755 $@
 
 $(INSTPATH):