From 4cf025ca52de55a2ea11f380a024bcb4f280d3c0 Mon Sep 17 00:00:00 2001
From: Thomas Grill <xovo@users.sourceforge.net>
Date: Tue, 10 Jun 2003 02:38:41 +0000
Subject:  ""

svn path=/trunk/; revision=688
---
 externals/grill/xsample/makefile.pd-darwin |  10 +++++-----
 externals/grill/xsample/source/main.h      |   2 +-
 externals/grill/xsample/xsample.cw         | Bin 280733 -> 280733 bytes
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'externals/grill')

diff --git a/externals/grill/xsample/makefile.pd-darwin b/externals/grill/xsample/makefile.pd-darwin
index c88a505b..e6714efe 100755
--- a/externals/grill/xsample/makefile.pd-darwin
+++ b/externals/grill/xsample/makefile.pd-darwin
@@ -13,13 +13,13 @@ CONFIG=config-pd-darwin.txt
 
 include ${CONFIG}
 
-FLEXTLIB=$(FLEXTPATH)/flext.a
+FLEXTLIB=flext
 
 # compiler stuff
 INCLUDES=$(PDINC) 
 FLAGS=-DFLEXT_SYS=2
-CFLAGS=${UFLAGS} -O6 -Wno-unused -Wno-parentheses -Wno-switch -Wstrict-prototypes -funroll-loops -fmove-all-movables -frerun-loop-opt -fno-rtti -fno-exceptions 
-LIBS=m
+CFLAGS=${UFLAGS} -dynamic -O6 -Wno-unused -Wno-parentheses -Wno-switch -Wstrict-prototypes -funroll-loops -fmove-all-movables -frerun-loop-opt -fno-rtti -fno-exceptions 
+LIBS=m gcc $(FLEXTLIB)
 LDFLAGS=-bundle -bundle_loader $(PDBIN)
 FRAMEWORKS=Carbon
 
@@ -47,8 +47,8 @@ $(TARGDIR):
 $(TARGDIR)/%.o : $(SRCDIR)/%.cpp 
 	$(CXX) -c $(CFLAGS) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(FLEXTPATH)) $< -o $@
 
-$(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.o,$(SRCS)) $(FLEXTLIB) 
-	$(CXX) $(LDFLAGS) $^ $(patsubst %,-framework %,$(FRAMEWORKS)) $(patsubst %,-L%,$(LIBPATH)) $(patsubst %,-l%,$(LIBS)) -o $@ 
+$(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.o,$(SRCS)) 
+	$(CXX) $(LDFLAGS) $^ $(patsubst %,-framework %,$(FRAMEWORKS)) $(patsubst %,-L%,$(LIBPATH)) $(patsubst %,-l%,$(LIBS))  -o $@ 
 	chmod 755 $@
 
 
diff --git a/externals/grill/xsample/source/main.h b/externals/grill/xsample/source/main.h
index e73c4d84..0ffc021b 100644
--- a/externals/grill/xsample/source/main.h
+++ b/externals/grill/xsample/source/main.h
@@ -12,7 +12,7 @@ WARRANTIES, see the file, "license.txt," in this distribution.
 #define __XSAMPLE_H
 
 
-#define XSAMPLE_VERSION "0.3.0pre10"
+#define XSAMPLE_VERSION "0.3.0pre11"
 
 
 #define FLEXT_ATTRIBUTES 1 
diff --git a/externals/grill/xsample/xsample.cw b/externals/grill/xsample/xsample.cw
index 5e0c9d21..0c54ecad 100755
Binary files a/externals/grill/xsample/xsample.cw and b/externals/grill/xsample/xsample.cw differ
-- 
cgit v1.2.1