Update of /cvsroot/pure-data/externals/pidip In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19827
Modified Files: Makefile.in configure.ac Removed Files: Makefile configure Log Message: merged in fixes from branch-v0-39-2-extended so that it builds on Mac OS X, and works better with the Pd-extended build system
Index: Makefile.in =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/Makefile.in,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Makefile.in 11 Dec 2006 22:56:49 -0000 1.8 --- Makefile.in 14 Dec 2006 06:03:29 -0000 1.9 *************** *** 29,33 **** --- 29,39 ---- -DPDP_PIDIP_VERSION="$(PDP_PIDIP_VERSION)" -g
+ ifeq ($(shell uname -s),Darwin) + all: pidip.pd_darwin + endif + + ifeq ($(shell uname -s),Linux) all: pidip.pd_linux + endif
pdp_pidip_all: *************** *** 35,38 **** --- 41,49 ---- make -C modules
+ pidip.pd_darwin: pdp_pidip_all + rm -f pidip.pd_darwin + g++ -bundle -undefined dynamic_lookup -o pidip.pd_darwin modules/*.o system/*.o -L/sw/lib $(THEORA_LIBS) $(PDP_PIDIP_LIBS) $(IMLIB_LIBS) $(MAGICK_LIBS) + strip -x pidip.pd_darwin + pidip.pd_linux: pdp_pidip_all rm -f pidip.pd_linux
Index: configure.ac =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/configure.ac,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** configure.ac 11 Dec 2006 22:41:07 -0000 1.14 --- configure.ac 14 Dec 2006 06:03:30 -0000 1.15 *************** *** 75,79 ****
PDP_PIDIP_LIBS="$PDP_PIDIP_LIBS -lbz2 -lz -ldl -lmp3lame -logg -lvorbis -lvorbisenc" ! PDP_PIDIP_INCLUDES="-I$PD_DIR/src -I. -I$PDP_DIR/include -I../include -I../charmaps"
make clean --- 75,79 ----
PDP_PIDIP_LIBS="$PDP_PIDIP_LIBS -lbz2 -lz -ldl -lmp3lame -logg -lvorbis -lvorbisenc" ! PDP_PIDIP_INCLUDES="-I$PD_DIR/src -I. -I$PDP_DIR/include -I../include -I../charmaps -I/sw/include/libquicktime"
make clean
--- Makefile DELETED ---
--- configure DELETED ---