[PD-cvs] SF.net SVN: pure-data: [9903] branches/pd-extended/v0-40/externals

eighthave at users.sourceforge.net eighthave at users.sourceforge.net
Sun May 25 02:19:09 CEST 2008


Revision: 9903
          http://pure-data.svn.sourceforge.net/pure-data/?rev=9903&view=rev
Author:   eighthave
Date:     2008-05-24 17:19:09 -0700 (Sat, 24 May 2008)

Log Message:
-----------
merged in pdp/opengl changes from trunk, and added pdp_opengl to the automatic
builds on Mac OS X and GNU/Linux.

Modified Paths:
--------------
    branches/pd-extended/v0-40/externals/Makefile
    branches/pd-extended/v0-40/externals/pdp/opengl/Makefile
    branches/pd-extended/v0-40/externals/pdp/opengl/Makefile.config

Modified: branches/pd-extended/v0-40/externals/Makefile
===================================================================
--- branches/pd-extended/v0-40/externals/Makefile	2008-05-24 23:37:28 UTC (rev 9902)
+++ branches/pd-extended/v0-40/externals/Makefile	2008-05-25 00:19:09 UTC (rev 9903)
@@ -131,10 +131,10 @@
   LIB_TARGETS += 
 else
   ifeq ($(OS_NAME),darwin)
-    LIB_TARGETS += hid pdp pidip gem2pdp iem16 apple
+    LIB_TARGETS += hid pdp pidip gem2pdp iem16 apple pdp_opengl
   else
     # GNU/Linux, BSD, IRIX, etc.
-    LIB_TARGETS += hid pdp pidip gem2pdp hdspm_mixer iem16 postlude
+    LIB_TARGETS += hid pdp pidip gem2pdp hdspm_mixer iem16 postlude pdp_opengl
   endif
 endif
 
@@ -2087,7 +2087,41 @@
 	-rm -f -- $(externals_src)/pdp/configure
 
 
+#------------------------------------------------------------------------------#
+# PDP_OPENGL
+PDP_OPENGL_NAME=3dp
+PDP_OPENGL_BINARY := $(externals_src)/pdp/opengl/pdp_opengl.$(EXTENSION)
+$(PDP_OPENGL_BINARY): $(externals_src)/pdp/Makefile.config
+	make -C $(externals_src)/pdp/opengl
 
+pdp_opengl: $(PDP_OPENGL_BINARY)
+	echo $(PDP_OPENGL_BINARY)
+
+pdp_opengl_install: pdp_opengl
+	install -d $(objectsdir)/$(PDP_OPENGL_NAME)
+	$(scripts_src)/generate-libdir-metafile.sh $(objectsdir) $(PDP_OPENGL_NAME) \
+		--author "Tom Schouten" \
+		--description "opengl extensions for pdp" \
+		--license "GPL v2 or later"
+	install -p $(PDP_OPENGL_BINARY) $(objectsdir)
+	install -p $(externals_src)/pdp/opengl/abstractions/*.pd \
+		$(objectsdir)/$(PDP_OPENGL_NAME)
+	install -d $(helpdir)
+	install -p $(externals_src)/pdp/opengl/doc/objects/*.pd $(helpdir)
+	install -d $(readmesdir)
+	install -p $(externals_src)/pdp/opengl/README \
+		$(readmesdir)/$(PDP_OPENGL_NAME).txt
+	install -d $(examplesdir)/$(PDP_OPENGL_NAME)
+	install -p $(externals_src)/pdp/opengl/doc/examples/*.pd \
+		$(examplesdir)/$(PDP_OPENGL_NAME)
+
+pdp_opengl_clean:
+	make -C $(externals_src)/pdp/opengl clean
+	-rm -f -- $(PDP_OPENGL_BINARY)
+	-rm -f -- $(externals_src)/pdp_opengl/*.bak
+	-rm -f -- $(externals_src)/pdp_opengl/*.*~
+
+
 #------------------------------------------------------------------------------#
 # PIDIP
 PIDIP_NAME=pidip

Modified: branches/pd-extended/v0-40/externals/pdp/opengl/Makefile
===================================================================
--- branches/pd-extended/v0-40/externals/pdp/opengl/Makefile	2008-05-24 23:37:28 UTC (rev 9902)
+++ branches/pd-extended/v0-40/externals/pdp/opengl/Makefile	2008-05-25 00:19:09 UTC (rev 9903)
@@ -24,7 +24,7 @@
 
 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_darwin ../modules/*/*.o ../system/pdp.o ../system/*/*.o ../puredata/*.o modules/*.o system/*.o $(PDP_LIBS) -bundle -undefined dynamic_lookup -bundle_loader $(PD_EXECUTABLE)
 
 
 # $(CC) -o pdp_opengl.pd_pd_darwin modules/*.o system/*.o $(LDFLAGS) -g -dynamic -bundle -flat_namespace -undefined suppress

Modified: branches/pd-extended/v0-40/externals/pdp/opengl/Makefile.config
===================================================================
--- branches/pd-extended/v0-40/externals/pdp/opengl/Makefile.config	2008-05-24 23:37:28 UTC (rev 9902)
+++ branches/pd-extended/v0-40/externals/pdp/opengl/Makefile.config	2008-05-25 00:19:09 UTC (rev 9903)
@@ -8,25 +8,28 @@
 
 CFLAGS = -DPD -O2 -funroll-loops -fomit-frame-pointer  -ffast-math \
     -Wall -W -Wstrict-prototypes -Werror \
-    -Wno-unused -Wno-parentheses -Wno-switch -g
+    -Wno-unused -Wno-parentheses -Wno-switch -g -I../../../../pd/src
 
 
 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
+UNAME := $(shell uname -s)
+ifeq ($(UNAME),Linux)
+  TARGET=linux
+  LDFLAGS = -lGL -lglut
+endif
+ifeq ($(UNAME),Darwin)
+  TARGET = darwin
+  CPPFLAGS += -I/sw/include
+  PD_EXECUTABLE=../../../pd/bin/pd
+  LDFLAGS = -lGL -lGLU -lglut -lX11 -L/sw/lib -L/usr/X11R6/lib
+endif
 
-TARGET=linux
 
+
 PDP_OPENGL_LIBRARY_NAME=pdp_opengl.pd_$(TARGET)
 
-#uncomment these for darwin:
-#TARGET=darwin
-#CPPFLAGS+=-I/sw/include
-#PD_EXECUTABLE=/usr/local/bin/pd
-#LDFLAGS =  -lGL -lGLU -lglut -lX11 -L/sw/lib -L/usr/X11R6/lib
 
-
-
 .c.o:
 	$(CC) $(CFLAGS) $(CPPFLAGS) -o $*.o -c $*.c


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Pd-cvs mailing list