From 7a407681e04667a8a488693a12cd42148e59eb75 Mon Sep 17 00:00:00 2001 From: Thomas Grill Date: Sat, 7 Dec 2002 05:35:42 +0000 Subject: "" svn path=/trunk/; revision=281 --- externals/grill/flext/flext.cw | Bin 202097 -> 202097 bytes externals/grill/vasp/config-pd-darwin.txt | 13 +++-- externals/grill/vasp/config-pd-linux.txt | 11 ++-- externals/grill/vasp/makefile.pd-darwin | 4 +- externals/grill/vasp/makefile.pd-linux | 2 +- externals/grill/xsample/build-pd-darwin.sh | 17 ++++++ externals/grill/xsample/config-pd-darwin.txt | 31 +++++++++++ externals/grill/xsample/make-files.txt | 7 +++ externals/grill/xsample/makefile.pd-darwin | 78 +++++++++++++++++++++++++++ externals/grill/xsample/maxmsp/xsample.help | Bin 0 -> 1073 bytes externals/grill/xsample/source/xsample.cw | Bin 105160 -> 0 bytes externals/grill/xsample/source/xsample.rsrc | 29 ++++++++++ externals/grill/xsample/xsample.cw | Bin 0 -> 106655 bytes 13 files changed, 180 insertions(+), 12 deletions(-) create mode 100755 externals/grill/xsample/build-pd-darwin.sh create mode 100755 externals/grill/xsample/config-pd-darwin.txt create mode 100755 externals/grill/xsample/make-files.txt create mode 100755 externals/grill/xsample/makefile.pd-darwin create mode 100755 externals/grill/xsample/maxmsp/xsample.help delete mode 100644 externals/grill/xsample/source/xsample.cw create mode 100755 externals/grill/xsample/source/xsample.rsrc create mode 100755 externals/grill/xsample/xsample.cw (limited to 'externals/grill') diff --git a/externals/grill/flext/flext.cw b/externals/grill/flext/flext.cw index 460009be..af84bce2 100644 Binary files a/externals/grill/flext/flext.cw and b/externals/grill/flext/flext.cw differ diff --git a/externals/grill/vasp/config-pd-darwin.txt b/externals/grill/vasp/config-pd-darwin.txt index 596c1d4d..b5b617df 100755 --- a/externals/grill/vasp/config-pd-darwin.txt +++ b/externals/grill/vasp/config-pd-darwin.txt @@ -5,16 +5,19 @@ # your c++ compiler (normally g++) CXX=g++ +# where does the PD installation reside? +PD=/usr/local/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 -PDPATH=/usr/local/pd/src +PDINC=${PD}/src # where is the PD executable? -PD=/usr/local/pd/bin/pd +PDBIN=${PD}/bin/pd # where do the flext libraries reside? -FLEXTPATH=/usr/local/pd/flext +FLEXTPATH=${PD}/flext # where should flext libraries be built? TARGDIR=./pd-darwin @@ -22,9 +25,9 @@ TARGDIR=./pd-darwin # where should VASP be installed? # (leave blank to omit installation) # a subfolder "vasp" will be created for the files -INSTDIR=/usr/local/pd/extra +INSTDIR=${PD}/extra # where should the VASP help be installed? # (leave blank to omit installation) # a subfolder "vasp" will be created for the files -HELPDIR=/usr/local/pd/doc/5.reference +HELPDIR=${PD}/doc/5.reference diff --git a/externals/grill/vasp/config-pd-linux.txt b/externals/grill/vasp/config-pd-linux.txt index 0a01f364..9a5a177f 100644 --- a/externals/grill/vasp/config-pd-linux.txt +++ b/externals/grill/vasp/config-pd-linux.txt @@ -5,13 +5,16 @@ # your c++ compiler (normally g++) CXX=g++ +# where does the PD installation reside? +PD=/usr/local/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 -PDPATH= +PDINC= # where do the flext libraries reside? -FLEXTPATH=/usr/local/lib/pd/flext +FLEXTPATH=${PD}/flext # where should flext libraries be built? TARGDIR=./pd-linux @@ -19,9 +22,9 @@ TARGDIR=./pd-linux # where should VASP be installed? # (leave blank to omit installation) # a subfolder "vasp" will be created for the files -INSTDIR=/usr/local/lib/pd/extra +INSTDIR=${PD}/extra # where should the VASP help be installed? # (leave blank to omit installation) # a subfolder "vasp" will be created for the files -HELPDIR=/usr/local/lib/pd/doc/5.reference +HELPDIR=${PD}/doc/5.reference diff --git a/externals/grill/vasp/makefile.pd-darwin b/externals/grill/vasp/makefile.pd-darwin index 713ad0fd..909e2403 100755 --- a/externals/grill/vasp/makefile.pd-darwin +++ b/externals/grill/vasp/makefile.pd-darwin @@ -16,11 +16,11 @@ include ${CONFIG} FLEXTLIB=$(FLEXTPATH)/flext_t.a # compiler stuff -INCLUDES=$(PDPATH) +INCLUDES=$(PDINC) FLAGS=-DFLEXT_SYS=2 -DFLEXT_THREADS CFLAGS=-O6 -Wno-unused -Wno-parentheses -Wno-switch -Wstrict-prototypes # -maltivec LIBS=m -LDFLAGS=-bundle -bundle_loader $(PD) +LDFLAGS=-bundle -bundle_loader $(PDBIN) # ---------------------------------------------- # the rest can stay untouched diff --git a/externals/grill/vasp/makefile.pd-linux b/externals/grill/vasp/makefile.pd-linux index 5c156ebe..2acabdc8 100644 --- a/externals/grill/vasp/makefile.pd-linux +++ b/externals/grill/vasp/makefile.pd-linux @@ -14,7 +14,7 @@ include config-pd-linux.txt FLEXTLIB=$(FLEXTPATH)/flext_t.a # compiler stuff -INCLUDES=$(PDPATH) +INCLUDES=$(PDINC) FLAGS=-DFLEXT_SYS=2 -DFLEXT_THREADS CFLAGS=-O6 -mcpu=pentiumpro -fmove-all-movables -frerun-loop-opt -finline-functions # -funroll-loops #CFLAGS=-O6 -mcpu=pentium3 -msse -mfpmath=sse -fmove-all-movables -frerun-loop-opt -finline-functions # -funroll-loops diff --git a/externals/grill/xsample/build-pd-darwin.sh b/externals/grill/xsample/build-pd-darwin.sh new file mode 100755 index 00000000..38814a9a --- /dev/null +++ b/externals/grill/xsample/build-pd-darwin.sh @@ -0,0 +1,17 @@ +#!/bin/sh + +SYS=pd-darwin + +. config-${SYS}.txt + +make -f makefile.${SYS} && +{ + if [ $INSTDIR != "" ]; then + echo Now install as root + sudo make -f makefile.${SYS} install + fi + if [ $HELPDIR != "" ]; then + echo Now install help as root + sudo make -f makefile.${SYS} install-help + fi +} diff --git a/externals/grill/xsample/config-pd-darwin.txt b/externals/grill/xsample/config-pd-darwin.txt new file mode 100755 index 00000000..8344a8d3 --- /dev/null +++ b/externals/grill/xsample/config-pd-darwin.txt @@ -0,0 +1,31 @@ +# xsample - extended sample objects for Max/MSP and pd (pure data) +# Copyright (c) 2001,2002 Thomas Grill (xovo@gmx.net) +# + +# your c++ compiler (normally g++) +CXX=g++ + +# where does the PD installation reside? +PD=/usr/local/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 + +# where is the PD executable? +PDBIN=${PD}/bin/pd + +# where do the flext libraries reside? +FLEXTPATH=${PD}/flext + +# where should flext libraries be built? +TARGDIR=./pd-darwin + +# where should xsample be installed? +# (leave blank to omit installation) +INSTDIR=${PD}/extra + +# where should the xsample help be installed? +# (leave blank to omit installation) +HELPDIR=${PD}/doc/5.reference diff --git a/externals/grill/xsample/make-files.txt b/externals/grill/xsample/make-files.txt new file mode 100755 index 00000000..d96d8485 --- /dev/null +++ b/externals/grill/xsample/make-files.txt @@ -0,0 +1,7 @@ +# all the source files from the package +SRCS= \ + main.cpp play.cpp groove.cpp record.cpp inter.cpp + +HDRS= \ + main.h inter.ci + diff --git a/externals/grill/xsample/makefile.pd-darwin b/externals/grill/xsample/makefile.pd-darwin new file mode 100755 index 00000000..0573cb4d --- /dev/null +++ b/externals/grill/xsample/makefile.pd-darwin @@ -0,0 +1,78 @@ +# xsample - extended sample objects for Max/MSP and pd (pure data) +# Copyright (c) 2001,2002 Thomas Grill (xovo@gmx.net) +# +# Makefile for gcc @ OSX (darwin) +# +# usage: +# to build run "make -f makefile.pd-darwin" +# to install (as root), do "make -f makefile.pd-darwin install" +# to install help, do "make -f makefile.pd-darwin install-help" +# + +CONFIG=config-pd-darwin.txt + +include ${CONFIG} + +FLEXTLIB=$(FLEXTPATH)/flext_t.a + +# compiler stuff +INCLUDES=$(PDINC) +FLAGS=-DFLEXT_SYS=2 -DFLEXT_THREADS +CFLAGS=-O6 -Wno-unused -Wno-parentheses -Wno-switch -Wstrict-prototypes # -maltivec +LIBS=m +LDFLAGS=-bundle -bundle_loader $(PDBIN) + +# ---------------------------------------------- +# the rest can stay untouched +# ---------------------------------------------- + +NAME=xsample +SRCDIR=source + +include make-files.txt + +MAKEFILE=makefile.pd-darwin +TARGET=$(TARGDIR)/$(NAME).pd_darwin + + +# default target +all: $(TARGDIR) $(TARGET) + +$(patsubst %,$(SRCDIR)/%,$(SRCS)): $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(MAKEFILE) $(CONFIG) + touch $(patsubst %,$(SRCDIR)/%,$(SRCS)) + +$(TARGDIR): + mkdir $(TARGDIR) + +$(TARGDIR)/%.o : $(SRCDIR)/%.cpp + $(CXX) -c $(CFLAGS) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(FLEXTPATH)) $< -o $@ + +$(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.o,$(SRCS)) $(FLEXTLIB) + $(CXX) $(LDFLAGS) $^ $(patsubst %,-l%,$(LIBS)) -o $@ + chmod 755 $@ + + +$(INSTDIR): + mkdir $(INSTDIR) + +install:: $(INSTDIR) + +install:: $(TARGET) + cp -R $^ $(INSTDIR) +# chown -R root.root $(INSTDIR) + + +$(HELPDIR): + mkdir $(HELPDIR) + +install-help:: $(HELPDIR) + +install-help:: ./pd + cp $^/*.* $(HELPDIR) +# chown -R root.root $(HELPDIR) + + +.PHONY: clean +clean: + rm -f $(TARGDIR)/*.o $(TARGET) + diff --git a/externals/grill/xsample/maxmsp/xsample.help b/externals/grill/xsample/maxmsp/xsample.help new file mode 100755 index 00000000..df57665f Binary files /dev/null and b/externals/grill/xsample/maxmsp/xsample.help differ diff --git a/externals/grill/xsample/source/xsample.cw b/externals/grill/xsample/source/xsample.cw deleted file mode 100644 index 9ac0d8c8..00000000 Binary files a/externals/grill/xsample/source/xsample.cw and /dev/null differ diff --git a/externals/grill/xsample/source/xsample.rsrc b/externals/grill/xsample/source/xsample.rsrc new file mode 100755 index 00000000..eb62e523 --- /dev/null +++ b/externals/grill/xsample/source/xsample.rsrc @@ -0,0 +1,29 @@ +(This file must be converted with BinHex 4.0) +:!!"bFh*M8P0&4!#3#!8hIF-!N!3"!!!!"-!!!!2!!!!!Gb"MEfjdB@PZC@3JE@9 +cFf&RC5"TEL"LD@jKFRNJ+Lm0$@KcE'PNCA+j,R*cFQ-#!!)!FR0bBe*6483"!2q +3"!)!FR0bBe*6483"!2q3"!#3%U((pmm!N!B%Z#TLAhC`D@il#3N[+L"`BA4MD'P +ZE'9d)'PZ)(4SDA-JF'&dBfKPFLGc)(CTFfpLDL!U,`d*#94&5'&ZC'aP)'*IG'9 +S1`Q3"#mU)(4PH(3JC@4TG'pb)'KKEQ4XC5!U,`d*I5"LAh9Z1`ep1`d0,bSJBQp +i)'CXB@Gc)#S[$3dMC!!!!1aJ#J!!E8&i6!a#!!"1qJ!`6R8LAb!I,S"R%L"!F!! +3%'!%%1J!!9()rrT#%%l4@8m[,`!)6VVrh#"I)!K1G8j@r[T)j`!`*Qi!#&P2,ca +Y3AK-2c`!!DJ1)&mN5#!+Cbi[#NKZr[T)E[lm5'lr!+QS5'lr!%kkrlK)E[m!3IS +!,NK3)'X!N!"1N!"2l`!-B!j"qJ!f5&!JD`#3!%k3!&K260m-!%jH6R@%E@&TEJ! +!3#9c1L"ZEh3JBACKD@aKBQaP)'C[FL!f1%X!G'KTFb"[BQTPBh3JDA-JEQpd)'& +fB@PXB@*XC5"QEh)J0MK,!*!&l'!+!!"Y3AK-$%)!!%lk!$"1G5*I)"mZJ'F5)%" +`!"!3B!33k!!"8FMrqN)36Y&C6bm[!!K1Z[rF)&mJ#%je6PEqqNMR!$!QEJ!)@8m +[2'e"H%`r2!!"U!iJAb4))!TR,Lm+5'lqqNKZr[a)E[m!UDK)E[m!6VVrZ%KZr`" +"qJ!Z5&!JD`#3!%k3!%r[!!aJ$N(k!$C)8#"V!*!!6T!!@%p-h``!6Pj1GB4YB@P +Z!!"!*A-k)'j[G#"KGQ&TE'&LE'8JCQpb)$Bi5`"dD'Pc)'pLDQ9MG#"TFb"ZEh3 +JBACKD@aKBQaP)'C[FL!f1%X!N!AXB!S!!'e"H%`-3J!!6[S!-%je)PmJ(bk!Ca) +J3(!!%""J""$S!!&4b2rk3K"1d9P2,bm!#%kkrp`JAb!)6R919[lk51F!-#CZ!!K +C6bmmE8&i6$mm!!'S$L"I*%JJ#QFZ,`T)E[lk5'lqr%KZr`#TU%KZr`"1Z[qi5'l +r!%(k!#j)8#"V!*!!6T!!6qm!$'!13IS!0NK3)'X!N!"1N!"B6dcI$!"1ANjeK'e +KD@i!!%!PFcSJEQpd)'&fB@PXB@*XC5"QEh)J0MK,!(4SDA-JEf*UC@0d)'Pc)'j +[G#"KGQ&TE'&LE'8JCQpb)$Bi5`#3"HaJ#J!!E8&i6!a#!!"1qJ!`6R8LAb!I,S" +R%L"!F!!3%'!%%1J!!9()rrT#%%l4@8m[,`!)6VVrh#"I)!K1G8j@r[T)j`!`*Qi +!#&P2,caY3AK-2c`!!DJ1)&mN5#!+Cbi[#NKZr[T)E[lm5'lr!+QS5'lr!%kkrlK +)E[m!3IS!,NK3)'X!N!"1N!"2l`!-B!j"qJ!f5&!JD`#3!%k3!&K260m-!%jH6R@ +%E@&TEJ!!3#9c1L"ZEh3JBACKD@aKBQaP)'C[FL!f1%X!G'KTFb"[BQTPBh3JDA- +JEQpd)'&fB@PXB@*XC5"QEh)J0MK,!*!%!3!!!!6!!!!$`!!!!(F9906%"6i!!!! +F!&B!!'e"H%`!!`!+(d!!N!B9901`(d%!#!!!!2!9901X(d)!%3!!!H!9901S(d- +!'!!!!Y!9901N"hKcB@e`E'8)H'GbEfpfCAi'H("XBAPq#(KbC@0[FQ4qq+N: diff --git a/externals/grill/xsample/xsample.cw b/externals/grill/xsample/xsample.cw new file mode 100755 index 00000000..d36f4698 Binary files /dev/null and b/externals/grill/xsample/xsample.cw differ -- cgit v1.2.1