From 59b0aae67b1e72fce38c208382ce099bb88e5644 Mon Sep 17 00:00:00 2001
From: Thomas Grill <xovo@users.sourceforge.net>
Date: Thu, 23 Sep 2004 04:10:33 +0000
Subject:  ""

svn path=/trunk/; revision=2054
---
 externals/grill/xsample/config-pd-darwin.txt |   5 ++++-
 externals/grill/xsample/makefile.pd-darwin   |  23 +++++++++++++++--------
 externals/grill/xsample/xsample.cw           | Bin 399047 -> 399047 bytes
 3 files changed, 19 insertions(+), 9 deletions(-)

(limited to 'externals/grill/xsample')

diff --git a/externals/grill/xsample/config-pd-darwin.txt b/externals/grill/xsample/config-pd-darwin.txt
index 418da47d..b42988cc 100755
--- a/externals/grill/xsample/config-pd-darwin.txt
+++ b/externals/grill/xsample/config-pd-darwin.txt
@@ -11,7 +11,7 @@ PD=/usr/local/lib/pd
 # 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
-PDINC=${PD}/src
+#PDINC=${PD}/src
 
 # where is the PD executable?
 PDBIN=/usr/local/bin/pd
@@ -34,3 +34,6 @@ HELPDIR=${PD}/doc/5.reference
 # (check whether they fit your system!)
 UFLAGS=-malign-power -maltivec -faltivec
 
+# build with shared flext library
+FLEXT_SHARED=1
+
diff --git a/externals/grill/xsample/makefile.pd-darwin b/externals/grill/xsample/makefile.pd-darwin
index f501daea..e91f764c 100755
--- a/externals/grill/xsample/makefile.pd-darwin
+++ b/externals/grill/xsample/makefile.pd-darwin
@@ -1,5 +1,5 @@
 # xsample - extended sample objects for Max/MSP and pd (pure data)
-# Copyright (c) 2001-2003 Thomas Grill (xovo@gmx.net)
+# Copyright (c) 2001-2004 Thomas Grill (xovo@gmx.net)
 #
 # Makefile for gcc @ OSX (darwin)
 #
@@ -13,22 +13,29 @@ CONFIG=config-pd-darwin.txt
 
 include ${CONFIG}
 
-FLEXTLIB=$(FLEXTPATH)/libflext.a
-
 # compiler stuff
 INCLUDES=$(PDINC) 
 FLAGS=-DFLEXT_SYS=2
-CFLAGS=${UFLAGS} -dynamic -O2 -Wno-unused -Wno-parentheses -Wno-switch -Wstrict-prototypes -funroll-loops -fmove-all-movables -frerun-loop-opt -fno-rtti -fno-exceptions  
+CFLAGS=-O2 ${UFLAGS} -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)
+LDFLAGS=-bundle -bundle_loader $(PDBIN)
 FRAMEWORKS=Carbon veclib
 
+ifdef FLEXT_SHARED
+CFLAGS+=-DFLEXT_SHARED
+LDFLAGS+=-L$(FLEXTPATH)
+FLEXTLIB=-lflext
+
+else
+
+FLEXTLIB=$(FLEXTPATH)/libflext.a
+
+endif
+
 # ----------------------------------------------
 # the rest can stay untouched
 # ----------------------------------------------
 
-NAME=xsample
-
 include make-files.txt
 
 MAKEFILE=makefile.pd-darwin
@@ -48,7 +55,7 @@ $(TARGDIR)/%.o : $(SRCDIR)/%.cpp
 	$(CXX) -c $(CFLAGS) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(FLEXTPATH)) $< -o $@
 
 $(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.o,$(SRCS)) 
-	$(CXX) $(LDFLAGS) $^ $(patsubst %,-framework %,$(FRAMEWORKS)) $(patsubst %,-L%,$(LIBPATH)) $(patsubst %,-l%,$(LIBS))  -o $@ 
+	$(CXX) $(LDFLAGS) $^ $(patsubst %,-framework %,$(FRAMEWORKS)) $(patsubst %,-L%,$(LIBPATH)) $(patsubst %,-l%,$(LIBS)) $(FLEXTLIB) -o $@ 
 	chmod 755 $@
 
 
diff --git a/externals/grill/xsample/xsample.cw b/externals/grill/xsample/xsample.cw
index a74428fd..2deb0271 100755
Binary files a/externals/grill/xsample/xsample.cw and b/externals/grill/xsample/xsample.cw differ
-- 
cgit v1.2.1