[PD-cvs] externals/grill/pool config-pd-darwin.txt,1.4,1.5 config-pd-mingw.txt,1.1,1.2 makefile.pd-darwin,1.4,1.5 makefile.pd-mingw,1.1,1.2 pool.cw,1.13,1.14 pool.help,1.9,1.10 pool.vcproj,1.7,1.8

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

Modified Files: config-pd-darwin.txt config-pd-mingw.txt makefile.pd-darwin makefile.pd-mingw pool.cw pool.help pool.vcproj Log Message: ""

Index: pool.vcproj =================================================================== RCS file: /cvsroot/pure-data/externals/grill/pool/pool.vcproj,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** pool.vcproj 22 Apr 2004 02:41:30 -0000 1.7 --- pool.vcproj 21 Jun 2004 14:02:55 -0000 1.8 *************** *** 177,185 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="maxapi.lib maxext.lib maxaudio.lib" OutputFile="max-msvc/pool.mxe" LinkIncremental="1" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="&quot;F:\prog\audio\MaxWinSDK\c74support\max-includes\win-includes\release&quot;;&quot;F:\prog\audio\MaxWinSDK\c74support\msp-includes\win-includes\release&quot;,f:\prog\max\flext\max-msvc" ProgramDatabaseFile=".\pd-msvc/r/pool.pdb" ImportLibrary=".\max-msvc/r/pool.lib" --- 177,185 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="maxapi.lib maxaudio.lib" OutputFile="max-msvc/pool.mxe" LinkIncremental="1" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="&quot;F:\prog\audio\maxwinsdk\c74support\max-includes&quot;;&quot;F:\prog\audio\MaxWinSDK\c74support\msp-includes&quot;;&quot;f:\prog\max\flext\max-msvc&quot;" ProgramDatabaseFile=".\pd-msvc/r/pool.pdb" ImportLibrary=".\max-msvc/r/pool.lib"

Index: makefile.pd-darwin =================================================================== RCS file: /cvsroot/pure-data/externals/grill/pool/makefile.pd-darwin,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** makefile.pd-darwin 8 Jan 2004 03:38:35 -0000 1.4 --- makefile.pd-darwin 21 Jun 2004 14:02:52 -0000 1.5 *************** *** 13,26 **** include $(CONFIG)

- FLEXTLIB=$(FLEXTPATH)/flext.a - # compiler+linker stuff INCLUDES=$(PDPATH) LIBPATH= FLAGS=-DFLEXT_SYS=2 ! CFLAGS=-O6 ${UFLAGS} -Wno-unused -Wno-parentheses -Wno-switch -Wstrict-prototypes LIBS=m - LDFLAGS=-bundle -bundle_loader $(PD) FRAMEWORKS=Carbon

--- 13,35 ---- include $(CONFIG)

# compiler+linker stuff INCLUDES=$(PDPATH) LIBPATH= FLAGS=-DFLEXT_SYS=2 ! CFLAGS=-O2 ${UFLAGS} -Wno-unused -Wno-parentheses -Wno-switch -Wstrict-prototypes LIBS=m FRAMEWORKS=Carbon + LDFLAGS+=-bundle -bundle_loader $(PD) + + ifdef FLEXT_SHARED + CFLAGS+=-dynamic -DFLEXT_SHARED + LDFLAGS+=-dynamic -L$(FLEXTPATH) + FLEXTLIB=-lflext + + else + + FLEXTLIB=$(FLEXTPATH)/libflext.a + + endif

*************** *** 37,41 **** all: $(TARGDIR) $(TARGET)

! $(patsubst %,$(SRCDIR)/%,$(SRCS)): $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(FLEXTLIB) $(CONFIG) touch $@

--- 46,50 ---- all: $(TARGDIR) $(TARGET)

! $(patsubst %,$(SRCDIR)/%,$(SRCS)): $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(CONFIG) touch $@

*************** *** 46,51 **** $(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 $@ chmod 755 $@

--- 55,60 ---- $(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)) $(FLEXTLIB) -o $@ chmod 755 $@

*************** *** 57,62 **** install:: $(TARGET) cp $^ $(INSTPATH) ! # chown root.root $(patsubst %,$(INSTPATH)/%,$(notdir $^)) ! # chmod 755 $(patsubst %,$(INSTPATH)/%,$(notdir $^))

.PHONY: clean --- 66,71 ---- install:: $(TARGET) cp $^ $(INSTPATH) ! chmod 755 $(patsubst %,$(INSTPATH)/%,$(notdir $^)) ! chown root $(patsubst %,$(INSTPATH)/%,$(notdir $^))

.PHONY: clean

Index: config-pd-mingw.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/pool/config-pd-mingw.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** config-pd-mingw.txt 7 Jun 2004 18:10:09 -0000 1.1 --- config-pd-mingw.txt 21 Jun 2004 14:02:52 -0000 1.2 *************** *** 23,25 **** # define for shared build FLEXT_SHARED=1 - --- 23,24 ----

Index: pool.help =================================================================== RCS file: /cvsroot/pure-data/externals/grill/pool/pool.help,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 Binary files /tmp/cvs7SKtUW and /tmp/cvsZr9kCl differ

Index: config-pd-darwin.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/pool/config-pd-darwin.txt,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** config-pd-darwin.txt 8 Jan 2004 03:38:35 -0000 1.4 --- config-pd-darwin.txt 21 Jun 2004 14:02:52 -0000 1.5 *************** *** 28,30 **** --- 28,33 ---- UFLAGS=-malign-power -maltivec

+ # use shared flext library + FLEXT_SHARED=1 +

Index: pool.cw =================================================================== RCS file: /cvsroot/pure-data/externals/grill/pool/pool.cw,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 Binary files /tmp/cvsOSMgiY and /tmp/cvsOc4wxo differ

Index: makefile.pd-mingw =================================================================== RCS file: /cvsroot/pure-data/externals/grill/pool/makefile.pd-mingw,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** makefile.pd-mingw 7 Jun 2004 18:10:07 -0000 1.1 --- makefile.pd-mingw 21 Jun 2004 14:02:52 -0000 1.2 *************** *** 58,68 **** clean: rm -f $(TARGDIR)/*.o $(TARGET) - - - - - - - - - --- 58,59 ----