[PD-cvs] externals/pidip Makefile,1.12,1.13

[Yves Degoyon]

Update of /cvsroot/pure-data/externals/pidip
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24069

Modified Files:
	Makefile 
Log Message:
detect quicktime and runs without magick

Index: Makefile
===================================================================
RCS file: /cvsroot/pure-data/externals/pidip/Makefile,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Makefile	21 Jul 2006 16:17:14 -0000	1.12
--- Makefile	11 Dec 2006 22:57:03 -0000	1.13
***************
*** 4,18 ****
  
  PDP_PIDIP_LIBS =  -lbz2 -lz -ldl -lmp3lame -logg -lvorbis -lvorbisenc
! IMLIB_CFLAGS = -I/usr/local/include -I/usr/X11R6/include
! IMLIB_LIBS = -L/usr/local/lib -lImlib2 -lfreetype -lz -lm -ldl -lXext -lXext -lX11 -L/usr/X11R6/lib
! MAGICK_CFLAGS = -I/usr/X11R6/include -g -O2 -Wall -pthread 
! MAGICK_LIBS = -L/usr/X11R6/lib -lMagick -lMagick -ltiff -lfreetype -ljpeg -lpng -lXext -lXt -lSM -lICE -lX11 -lbz2 -lxml2 -lz -lpthread -lm -lpthread -L/usr/local/lib -L/usr/X11R6/lib -lfreetype -lz -L/usr/lib
! 
! # what are those? seem to be related to xorg
! #MAGICK_LIBS += -ldpstk -ldps
! 
! #THEORA_LIBS =  /usr/lib/libtheora.a /usr/lib/libogg.a /usr/lib/libvorbis.a /usr/lib/libvorbisenc.a
! #THEORA_LIBS += /usr/local/lib/libtheora.a /usr/local/lib/libogg.a /usr/local/lib/libvorbis.a /usr/local/lib/libvorbisenc.a
! THEORA_LIBS =  -ltheora -logg -lvorbis -lvorbisenc
  PDP_PIDIP_INCLUDES =  -I/usr/local/pd/src -I. -I/usr/local/pd/pdp/include -I../include -I../charmaps
  PDP_PIDIP_VERSION = 0.12.20
--- 4,12 ----
  
  PDP_PIDIP_LIBS =  -lbz2 -lz -ldl -lmp3lame -logg -lvorbis -lvorbisenc
! IMLIB_CFLAGS = 
! IMLIB_LIBS = -L/usr/lib -lImlib2 -lfreetype -lz -L/usr/X11R6/lib -lX11 -lXext -ldl -lm
! MAGICK_CFLAGS = -I/usr/X11R6/include -O2 -g -pipe -m32 -march=i386 -mtune=pentium4 -Wall -pthread 
! MAGICK_LIBS = -L/usr/X11R6/lib -lMagick -lMagick -ltiff -lfreetype -ljpeg -lpng -ldpstk -ldps -lXext -lXt -lSM -lICE -lX11 -lbz2 -lxml2 -lz -lpthread -lm -lpthread -L/usr/lib -L/usr/X11R6/lib -lfreetype -lz -L/usr/lib
! THEORA_LIBS = -ltheora -logg -lvorbis -lvorbisenc /usr/local/lib/libtheora.a /usr/lib/libogg.a /usr/local/lib/libogg.a /usr/lib/libvorbis.a /usr/local/lib/libvorbis.a /usr/lib/libvorbisenc.a /usr/local/lib/libvorbisenc.a
  PDP_PIDIP_INCLUDES =  -I/usr/local/pd/src -I. -I/usr/local/pd/pdp/include -I../include -I../charmaps
  PDP_PIDIP_VERSION = 0.12.20
***************
*** 25,29 ****
  PDP_PIDIP_CFLAGS  = $(MPEG4IP_CFLAGS) $(MAGICK_CFLAGS) $(IMLIB_CFLAGS) \
      -DPD -DX_DISPLAY_MISSING -O2 -funroll-loops -fomit-frame-pointer  -ffast-math \
!     -Wall -W -Wstrict-prototypes -fPIC \
      -Wno-unused -Wno-parentheses -Wno-switch \
      -DPDP_PIDIP_VERSION=\"$(PDP_PIDIP_VERSION)\" -g
--- 19,23 ----
  PDP_PIDIP_CFLAGS  = $(MPEG4IP_CFLAGS) $(MAGICK_CFLAGS) $(IMLIB_CFLAGS) \
      -DPD -DX_DISPLAY_MISSING -O2 -funroll-loops -fomit-frame-pointer  -ffast-math \
!     -Wall -W -Wstrict-prototypes \
      -Wno-unused -Wno-parentheses -Wno-switch \
      -DPDP_PIDIP_VERSION=\"$(PDP_PIDIP_VERSION)\" -g
***************
*** 31,35 ****
  PDP_PIDIP_CPPFLAGS  = $(MPEG4IP_CFLAGS) $(MAGICK_CFLAGS) $(IMLIB_CFLAGS) \
      -DPD -DX_DISPLAY_MISSING -O2 -funroll-loops -fomit-frame-pointer  -ffast-math \
!     -Wall -W -Wstrict-prototypes -fPIC \
      -Wno-unused -Wno-parentheses -Wno-switch \
      -DPDP_PIDIP_VERSION=\"$(PDP_PIDIP_VERSION)\" -g
--- 25,29 ----
  PDP_PIDIP_CPPFLAGS  = $(MPEG4IP_CFLAGS) $(MAGICK_CFLAGS) $(IMLIB_CFLAGS) \
      -DPD -DX_DISPLAY_MISSING -O2 -funroll-loops -fomit-frame-pointer  -ffast-math \
!     -Wall -W -Wstrict-prototypes \
      -Wno-unused -Wno-parentheses -Wno-switch \
      -DPDP_PIDIP_VERSION=\"$(PDP_PIDIP_VERSION)\" -g