Update of /cvsroot/pure-data/externals/grill/py In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19489
Modified Files: config-pd-darwin.txt make-files.txt makefile.pd-darwin Log Message: ""
Index: make-files.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/make-files.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** make-files.txt 15 Apr 2003 02:38:10 -0000 1.1 --- make-files.txt 23 Sep 2004 04:07:08 -0000 1.2 *************** *** 1,2 **** --- 1,4 ---- + NAME=py + # all the source files from the package SRCDIR=source
Index: makefile.pd-darwin =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/makefile.pd-darwin,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** makefile.pd-darwin 29 Dec 2003 21:30:25 -0000 1.4 --- makefile.pd-darwin 23 Sep 2004 04:07:08 -0000 1.5 *************** *** 13,31 **** include ${CONFIG}
- FLEXTLIB=${FLEXTPATH}/flext_t.a - # compiler+linker stuff INCLUDES=${PDPATH} ${FLEXTPATH} ! FLAGS=-DFLEXT_SYS=2 -DFLEXT_THREADS CFLAGS=$(UFLAGS) -Wno-long-double -Wno-unused -Wno-parentheses -Wno-switch -Wstrict-prototypes - #CFLAGS=-g LIBS=m ! LDFLAGS=-bundle -bundle_loader ${PD} -framework Python -framework Carbon
# --------------------------------------------- # the rest can stay untouched # ---------------------------------------------- - NAME=py - # all the source files from the package include make-files.txt --- 13,46 ---- include ${CONFIG}
# compiler+linker stuff INCLUDES=${PDPATH} ${FLEXTPATH} ! FLAGS=-DFLEXT_SYS=2 CFLAGS=$(UFLAGS) -Wno-long-double -Wno-unused -Wno-parentheses -Wno-switch -Wstrict-prototypes LIBS=m ! FRAMEWORKS=Python Carbon ! LDFLAGS=-bundle -bundle_loader ${PD} ! ! ifndef DEBUG ! CFLAGS+=-O2 ! else ! CFLAGS+=-g ! endif ! ! ifdef FLEXT_SHARED ! ! CFLAGS+=-dynamic -DFLEXT_SHARED ! LDFLAGS+=-dynamic -L$(FLEXTPATH) ! FLEXTLIB=-lflext ! ! else ! ! CFLAGS+=-DFLEXT_THREADS ! FLEXTLIB=$(FLEXTPATH)/libflext_t.a ! ! endif
# --------------------------------------------- # the rest can stay untouched # ---------------------------------------------- # all the source files from the package include make-files.txt *************** *** 38,56 **** all: $(TARGDIR) $(TARGET)
! $(patsubst %,$(SRCDIR)/%,$(SRCS)): $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(FLEXTLIB) $(MAKEFILE) $(CONFIG) touch $@
$(TARGDIR): ! mkdir $(TARGDIR)
$(TARGDIR)/%.o : $(SRCDIR)/%.cpp $(CXX) -c $(CFLAGS) $(FLAGS) $(patsubst %,-I%,$(INCLUDES)) $< -o $@
! $(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.o,$(SRCS)) $(FLEXTLIB) ! $(CXX) $(LDFLAGS) $^ $(patsubst %,-L%,$(LIBPATH)) $(patsubst %,-l%,$(LIBS)) -o $@ chmod 755 $@
$(INSTPATH): ! mkdir $(INSTPATH)
install:: $(INSTPATH) --- 53,71 ---- all: $(TARGDIR) $(TARGET)
! $(patsubst %,$(SRCDIR)/%,$(SRCS)): $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(MAKEFILE) $(CONFIG) touch $@
$(TARGDIR): ! -mkdir $(TARGDIR)
$(TARGDIR)/%.o : $(SRCDIR)/%.cpp $(CXX) -c $(CFLAGS) $(FLAGS) $(patsubst %,-I%,$(INCLUDES)) $< -o $@
! $(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.o,$(SRCS)) ! $(CXX) $(LDFLAGS) $^ $(FLEXTLIB) $(patsubst %,-framework %,$(FRAMEWORKS)) $(patsubst %,-L%,$(LIBPATH)) $(patsubst %,-l%,$(LIBS)) -o $@ chmod 755 $@
$(INSTPATH): ! -mkdir $(INSTPATH)
install:: $(INSTPATH)
Index: config-pd-darwin.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/config-pd-darwin.txt,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** config-pd-darwin.txt 29 Dec 2003 21:30:25 -0000 1.4 --- config-pd-darwin.txt 23 Sep 2004 04:07:08 -0000 1.5 *************** *** 8,12 **** # leave it blank if it is a system directory (like /usr/local/include), # since gcc 3.2 complains about it ! PDPATH=/usr/local/lib/pd/src
# where is the PD executable? --- 8,12 ---- # leave it blank if it is a system directory (like /usr/local/include), # since gcc 3.2 complains about it ! PDPATH=../../../pd/src
# where is the PD executable? *************** *** 23,25 ****
# user flags ! # UFLAGS=-O2 -faltivec -maltivec --- 23,28 ----
# user flags ! UFLAGS=-malign-power -faltivec -maltivec ! ! # use shared flext library ! FLEXT_SHARED=1