[PD-cvs] externals/gem2pdp configure.ac, 1.5, 1.6 configure, 1.4, 1.5 gem2pdp.h, 1.1, 1.2 INSTALL, 1.1, 1.2 Makefile.in, 1.2, 1.3

[Georg Holzmann]

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

Modified Files:
	configure.ac configure gem2pdp.h INSTALL Makefile.in 
Log Message:
some changes to get it compile (configure script, gem2pdp.cpp) and added pix_2pdp


Index: Makefile.in
===================================================================
RCS file: /cvsroot/pure-data/externals/gem2pdp/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.in	17 Sep 2003 22:35:05 -0000	1.2
--- Makefile.in	17 Jun 2005 13:44:08 -0000	1.3
***************
*** 16,20 ****
  PDP_PIDIP_CPPFLAGS  = -O
  
! all: gem2pdp.pd_linux pdp2gem.pd_linux
  
  pdp2gem.pd_linux: pdp2gem.o yuv.o
--- 16,20 ----
  PDP_PIDIP_CPPFLAGS  = -O
  
! all: gem2pdp.pd_linux pdp2gem.pd_linux pix_2pdp.pd_linux
  
  pdp2gem.pd_linux: pdp2gem.o yuv.o
***************
*** 26,33 ****
--- 26,38 ----
  	gcc -export_dynamic -shared -o gem2pdp.pd_linux gem2pdp.o yuv.o $(LIBS)
  
+ pix_2pdp.pd_linux: pix_2pdp.o yuv.o
+ 	rm -f pix_2pdp.pd_linux
+ 	gcc -export_dynamic -shared -o pix_2pdp.pd_linux pix_2pdp.o yuv.o $(LIBS)
+ 
  clean:
  	rm -f *.o
  	rm -f gem2pdp.pd_linux
  	rm -f pdp2gem.pd_linux
+ 	rm -f pix_2pdp.pd_linux
  
  distro: clean all

Index: configure.ac
===================================================================
RCS file: /cvsroot/pure-data/externals/gem2pdp/configure.ac,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** configure.ac	19 Apr 2005 00:56:23 -0000	1.5
--- configure.ac	17 Jun 2005 13:44:08 -0000	1.6
***************
*** 24,36 ****
  fi
  
! if test -d /usr/local/pd/gem; 
  then
!    GEM_DIR=/usr/local/pd/gem
! elif test -d ../../Gem; 
  then
! 	GEM_DIR=../../Gem
! elif  test -d ../gem/Gem; 
  then
! 	GEM_DIR=../gem/Gem
  else
     echo "Gem sources not found"
--- 24,36 ----
  fi
  
! if test -d /win/Georg/pd-cvs/gem/Gem; 
  then
!    GEM_DIR=/win/Georg/pd-cvs/gem/Gem
! elif test -d ../../gem/Gem; 
  then
! 	GEM_DIR=../../gem/Gem
! elif  test -d ../../gem/Gem; 
  then
! 	GEM_DIR=../../gem/Gem
  else
     echo "Gem sources not found"
***************
*** 50,53 ****
--- 50,72 ----
  AC_SUBST(GEM2PDP_VERSION)
  
+ AC_ARG_WITH(pddir,       [  --with-pddir=<dir>      specify an alternate pd source tree])
+ AC_ARG_WITH(gemdir,      [  --with-gemdir=<dir>     specify an alternate gem source tree])
+ AC_ARG_WITH(pdpdir,      [  --with-pdpdir=<dir>     specify an alternate pdp source tree])
+ 
+ if test "$with_gemdir" != ""
+ then
+  GEM_DIR=$with_gemdir
+ fi
+ 
+ if test "$with_pdpdir" != ""
+ then
+  PDP_DIR=$with_pdpdir
+ fi
+ 
+ if test "$with_pddir" != ""
+ then
+  PD_DIR=$with_pddir
+ fi
+ 
  echo -n "looking for gem sources (required) ... "
  if test -f $GEM_DIR/src/Base/GemMan.h

Index: gem2pdp.h
===================================================================
RCS file: /cvsroot/pure-data/externals/gem2pdp/gem2pdp.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** gem2pdp.h	1 Sep 2003 18:40:43 -0000	1.1
--- gem2pdp.h	17 Jun 2005 13:44:08 -0000	1.2
***************
*** 33,37 ****
     virtual void render(GemState *state);
     void         cleanImage();
!    t_int        m_packet0;
     t_pdp        *m_header;
     short int    *m_data;
--- 33,37 ----
     virtual void render(GemState *state);
     void         cleanImage();
!    int        m_packet0;
     t_pdp        *m_header;
     short int    *m_data;

Index: configure
===================================================================
RCS file: /cvsroot/pure-data/externals/gem2pdp/configure,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** configure	19 Apr 2005 00:56:23 -0000	1.4
--- configure	17 Jun 2005 13:44:08 -0000	1.5
***************
*** 1,8 ****
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
! # Generated by GNU Autoconf 2.57.
  #
! # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
! # Free Software Foundation, Inc.
  # This configure script is free software; the Free Software Foundation
  # gives unlimited permission to copy, distribute and modify it.
--- 1,7 ----
  #! /bin/sh
[...1961 lines suppressed...]
! 	   echo "$f"
! 	 elif test -f "$srcdir/$f"; then
! 	   # Source tree
! 	   echo "$srcdir/$f"
! 	 else
! 	   # /dev/null tree
! 	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
  echo "$as_me: error: cannot find input file: $f" >&2;}
     { (exit 1); exit 1; }; }
! 	 fi;;
        esac
      done` || { (exit 1); exit 1; }
+ 
+   if test x"$ac_file" != x-; then
+     { echo "$as_me:$LINENO: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF

Index: INSTALL
===================================================================
RCS file: /cvsroot/pure-data/externals/gem2pdp/INSTALL,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** INSTALL	1 Sep 2003 18:40:43 -0000	1.1
--- INSTALL	17 Jun 2005 13:44:08 -0000	1.2
***************
*** 3,11 ****
  pdp-0.9.0 and pidip-0.9.1 )
  
! fix PD, PDP and GEM paths in configure.ac
! 
! autoconf 
! 
! ./configure 
  
  make clean 
--- 3,8 ----
  pdp-0.9.0 and pidip-0.9.1 )
  
! Use the configure script and specify the directories:
! e.g.: ./configure --with-pddir=../../pd --with-gemdir=../../gem/Gem --with-pdpdir=../pdp
  
  make clean