[PD-cvs] SF.net SVN: pure-data: [9891] trunk/externals/pdp/opengl

eighthave at users.sourceforge.net eighthave at users.sourceforge.net
Sat May 24 03:20:15 CEST 2008


Revision: 9891
          http://pure-data.svn.sourceforge.net/pure-data/?rev=9891&view=rev
Author:   eighthave
Date:     2008-05-23 18:20:14 -0700 (Fri, 23 May 2008)

Log Message:
-----------
quick fixup on Makefiles to get things building on Mac OS X

Modified Paths:
--------------
    trunk/externals/pdp/opengl/Makefile
    trunk/externals/pdp/opengl/Makefile.config

Modified: trunk/externals/pdp/opengl/Makefile
===================================================================
--- trunk/externals/pdp/opengl/Makefile	2008-05-24 00:43:06 UTC (rev 9890)
+++ trunk/externals/pdp/opengl/Makefile	2008-05-24 01:20:14 UTC (rev 9891)
@@ -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_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: trunk/externals/pdp/opengl/Makefile.config
===================================================================
--- trunk/externals/pdp/opengl/Makefile.config	2008-05-24 00:43:06 UTC (rev 9890)
+++ trunk/externals/pdp/opengl/Makefile.config	2008-05-24 01:20:14 UTC (rev 9891)
@@ -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