[PD-cvs] externals/pdp/opengl Makefile, 1.3, 1.4 Makefile.config, 1.3, 1.4

[Tom Schouten]

Update of /cvsroot/pure-data/externals/pdp/opengl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2628/opengl

Modified Files:
	Makefile Makefile.config 
Log Message:
pdp current darcs merge

Index: Makefile
===================================================================
RCS file: /cvsroot/pure-data/externals/pdp/opengl/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile	16 Dec 2005 01:05:34 -0000	1.3
--- Makefile	1 Sep 2006 13:45:30 -0000	1.4
***************
*** 25,27 ****
  pdp_opengl.pd_darwin: subdirs
  	rm -f pdp_opengl.pd_linux
! 	$(CC) -o pdp_opengl.pd_pd_darwin modules/*.o system/*.o $(LDFLAGS) -g -bundle -bundle_loader $(PD_EXECUTABLE)
--- 25,44 ----
  pdp_opengl.pd_darwin: subdirs
  	rm -f pdp_opengl.pd_linux
! 	$(CC) -o pdp_opengl.pd_pd_darwin ../modules/*/*.o ../system/pdp.o ../system/*/*.o ../puredata/*.o modules/*.o system/*.o $(PDP_LIBS) -bundle -undefined error -twolevel_namespace -bundle_loader $(PD_EXECUTABLE)
! 
! 
! # $(CC) -o pdp_opengl.pd_pd_darwin modules/*.o system/*.o $(LDFLAGS) -g -dynamic -bundle -flat_namespace -undefined suppress
! # $(CC) -o pdp_opengl.pd_pd_darwin modules/*.o system/*.o $(LDFLAGS) -g -bundle -bundle_loader $(PD_EXECUTABLE)
! 
! install: all
! 	test -d $(prefix)/lib/pd 	#check if pd is installed. if this fails make install will stop here.
! 	install -d $(prefix)/lib/pd/extra
! 	install -m 755 $(PDP_OPENGL_LIBRARY_NAME) $(prefix)/lib/pd/extra
! 	install -m 644 abstractions/*.pd $(prefix)/lib/pd/extra
! 	install -m 644 doc/objects/*.pd $(prefix)/lib/pd/doc/5.reference
! 	install -m 755 -d $(prefix)/lib/pd/doc/pdp
! 	install -m 755 -d $(prefix)/lib/pd/doc/pdp/introduction
! 	install -m 755 -d $(prefix)/lib/pd/doc/pdp/examples_opengl
! 	install -m 644 doc/reference_opengl.txt $(prefix)/lib/pd/doc/pdp
! 	install -m 644 doc/examples/*.pd $(prefix)/lib/pd/doc/pdp/examples_opengl
! 

Index: Makefile.config
===================================================================
RCS file: /cvsroot/pure-data/externals/pdp/opengl/Makefile.config,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile.config	16 Dec 2005 01:05:34 -0000	1.3
--- Makefile.config	1 Sep 2006 13:45:30 -0000	1.4
***************
*** 1,6 ****
- PD_DIR = /home/tom/pd/distro/pd/src
- PDP_DIR = /home/tom/pd/packet/include
- PDP_OGL_DIR = /home/tom/pd/packet/opengl/include
  
  
  
--- 1,8 ----
  
+ prefix = /usr/local
+ 
+ PDP_VERSION=0.12.5-darcs
+ PDP_DIR = ../../include
+ PDP_OGL_DIR = ../include
  
  
***************
*** 9,17 ****
      -Wno-unused -Wno-parentheses -Wno-switch -g
  
! CPPFLAGS = -I$(PD_DIR) -I$(PDP_DIR) -I$(PDP_OGL_DIR) -I/usr/X11R6/include
  LDFLAGS =  -lGL -lglut
  
  TARGET=linux
  
  #uncomment these for darwin:
  #TARGET=darwin
--- 11,24 ----
      -Wno-unused -Wno-parentheses -Wno-switch -g
  
! 
! CPPFLAGS = -I$(PDP_DIR) -I$(PDP_OGL_DIR) -I/usr/X11R6/include -DPDP_VERSION=\"$(PDP_VERSION)\"
! # CPPFLAGS = -I$(PD_DIR) -I$(PDP_DIR) -I$(PDP_OGL_DIR) -I/usr/X11R6/include
! 
  LDFLAGS =  -lGL -lglut
  
  TARGET=linux
  
+ PDP_OPENGL_LIBRARY_NAME=pdp_opengl.pd_$(TARGET)
+ 
  #uncomment these for darwin:
  #TARGET=darwin