Update of /cvsroot/pure-data/externals/grill/xsample In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19237

Modified Files: config-pd-darwin.txt makefile.pd-darwin xsample.cw Log Message: ""

Index: makefile.pd-darwin =================================================================== RCS file: /cvsroot/pure-data/externals/grill/xsample/makefile.pd-darwin,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** makefile.pd-darwin 25 Sep 2003 02:37:50 -0000 1.9 --- makefile.pd-darwin 23 Sep 2004 04:06:01 -0000 1.10 *************** *** 1,4 **** # xsample - extended sample objects for Max/MSP and pd (pure data) ! # Copyright (c) 2001-2003 Thomas Grill (xovo@gmx.net) # # Makefile for gcc @ OSX (darwin) --- 1,4 ---- # xsample - extended sample objects for Max/MSP and pd (pure data) ! # Copyright (c) 2001-2004 Thomas Grill (xovo@gmx.net) # # Makefile for gcc @ OSX (darwin) *************** *** 14,33 **** 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 LIBS=m gcc ! LDFLAGS=$(FLEXTLIB) -bundle -bundle_loader $(PDBIN) FRAMEWORKS=Carbon veclib

# ---------------------------------------------- # the rest can stay untouched # ----------------------------------------------

- NAME=xsample - include make-files.txt

--- 14,40 ---- include ${CONFIG}

# compiler stuff INCLUDES=$(PDINC) FLAGS=-DFLEXT_SYS=2 ! 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=-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 # ----------------------------------------------

include make-files.txt

*************** *** 49,53 ****

$(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.o,$(SRCS)) ! $(CXX) $(LDFLAGS) $^ $(patsubst %,-framework %,$(FRAMEWORKS)) $(patsubst %,-L%,$(LIBPATH)) $(patsubst %,-l%,$(LIBS)) -o $@ chmod 755 $@

--- 56,60 ----

$(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.o,$(SRCS)) ! $(CXX) $(LDFLAGS) $^ $(patsubst %,-framework %,$(FRAMEWORKS)) $(patsubst %,-L%,$(LIBPATH)) $(patsubst %,-l%,$(LIBS)) $(FLEXTLIB) -o $@ chmod 755 $@

Index: config-pd-darwin.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/xsample/config-pd-darwin.txt,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** config-pd-darwin.txt 25 Sep 2003 02:37:50 -0000 1.6 --- config-pd-darwin.txt 23 Sep 2004 04:06:01 -0000 1.7 *************** *** 12,16 **** # leave it blank if it is a system directory (like /usr/local/include), # since gcc 3.2 complains about it ! PDINC=${PD}/src

# where is the PD executable? --- 12,16 ---- # leave it blank if it is a system directory (like /usr/local/include), # since gcc 3.2 complains about it ! #PDINC=${PD}/src

# where is the PD executable? *************** *** 35,36 **** --- 35,39 ---- UFLAGS=-malign-power -maltivec -faltivec

+ # build with shared flext library + FLEXT_SHARED=1 +

Index: xsample.cw =================================================================== RCS file: /cvsroot/pure-data/externals/grill/xsample/xsample.cw,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 Binary files /tmp/cvshgmlRc and /tmp/cvsHgYftf differ