""

svn path=/trunk/; revision=2054

3 files changed, 34 insertions, 14 deletions

diff --git a/externals/grill/py/config-pd-darwin.txt b/externals/grill/py/config-pd-darwin.txt
index 813d82c0..427395fa 100755
--- a/externals/grill/py/config-pd-darwin.txt
+++ b/externals/grill/py/config-pd-darwin.txt
@@ -7,7 +7,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/local/lib/pd/src
+PDPATH=../../../pd/src
 
 # where is the PD executable?
 PD=/usr/local/bin/pd
@@ -22,4 +22,7 @@ TARGDIR=./pd-darwin
 INSTPATH=/usr/local/lib/pd/extra
 
 # user flags
-# UFLAGS=-O2 -faltivec -maltivec
+UFLAGS=-malign-power -faltivec -maltivec
+
+# use shared flext library
+FLEXT_SHARED=1
diff --git a/externals/grill/py/make-files.txt b/externals/grill/py/make-files.txt
index dec24613..f4ddcdb9 100644
--- a/externals/grill/py/make-files.txt
+++ b/externals/grill/py/make-files.txt
@@ -1,3 +1,5 @@
+NAME=py
+
 # all the source files from the package
 SRCDIR=source
 
diff --git a/externals/grill/py/makefile.pd-darwin b/externals/grill/py/makefile.pd-darwin
index ab63aa97..6b73c207 100755
--- a/externals/grill/py/makefile.pd-darwin
+++ b/externals/grill/py/makefile.pd-darwin
@@ -12,21 +12,36 @@ CONFIG=config-pd-darwin.txt
 
 include ${CONFIG}
 
-FLEXTLIB=${FLEXTPATH}/flext_t.a
-
 # compiler+linker stuff	
 INCLUDES=${PDPATH} ${FLEXTPATH} 
-FLAGS=-DFLEXT_SYS=2 -DFLEXT_THREADS
+FLAGS=-DFLEXT_SYS=2 
 CFLAGS=$(UFLAGS) -Wno-long-double -Wno-unused -Wno-parentheses -Wno-switch -Wstrict-prototypes
-#CFLAGS=-g
 LIBS=m 
-LDFLAGS=-bundle -bundle_loader ${PD} -framework Python -framework Carbon
+FRAMEWORKS=Python Carbon
+LDFLAGS=-bundle -bundle_loader ${PD}
+
+ifndef DEBUG
+CFLAGS+=-O2
+else
+CFLAGS+=-g
+endif
+
+ifdef FLEXT_SHARED
+
+CFLAGS+=-dynamic -DFLEXT_SHARED
+LDFLAGS+=-dynamic -L$(FLEXTPATH)
+FLEXTLIB=-lflext
+
+else
+
+CFLAGS+=-DFLEXT_THREADS
+FLEXTLIB=$(FLEXTPATH)/libflext_t.a
+
+endif
 
 # ---------------------------------------------
 # the rest can stay untouched
 # ----------------------------------------------
-NAME=py
-
 # all the source files from the package
 include make-files.txt
 
@@ -37,21 +52,21 @@ MAKEFILE=makefile.pd-darwin
 # default target
 all: $(TARGDIR) $(TARGET)
 
-$(patsubst %,$(SRCDIR)/%,$(SRCS)): $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(FLEXTLIB) $(MAKEFILE) $(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)) $< -o $@
 
-$(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.o,$(SRCS)) $(FLEXTLIB) 
-	$(CXX) $(LDFLAGS) $^ $(patsubst %,-L%,$(LIBPATH)) $(patsubst %,-l%,$(LIBS)) -o $@ 
+$(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.o,$(SRCS))  
+	$(CXX) $(LDFLAGS) $^ $(FLEXTLIB) $(patsubst %,-framework %,$(FRAMEWORKS)) $(patsubst %,-L%,$(LIBPATH)) $(patsubst %,-l%,$(LIBS)) -o $@ 
 	chmod 755 $@
 
 $(INSTPATH):
-	mkdir $(INSTPATH)
+	-mkdir $(INSTPATH)
 
 install:: $(INSTPATH)