Update of /cvsroot/pure-data/externals/pdp/opengl/system In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2628/opengl/system
Modified Files: pdp_3Dcontext_common.c pdp_3Dcontext_glx.c pdp_opengl.c setup.c Log Message: pdp current darcs merge
Index: pdp_3Dcontext_common.c =================================================================== RCS file: /cvsroot/pure-data/externals/pdp/opengl/system/pdp_3Dcontext_common.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** pdp_3Dcontext_common.c 16 Dec 2005 01:05:35 -0000 1.3 --- pdp_3Dcontext_common.c 1 Sep 2006 13:45:30 -0000 1.4 *************** *** 29,35 **** #include "pdp_3Dcontext.h" #include <GL/gl.h> - //#include <GL/glx.h> #include <GL/glu.h> - //#include <GL/glut.h>
#define D if (0) --- 29,33 ----
Index: pdp_3Dcontext_glx.c =================================================================== RCS file: /cvsroot/pure-data/externals/pdp/opengl/system/pdp_3Dcontext_glx.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** pdp_3Dcontext_glx.c 16 Dec 2005 01:05:35 -0000 1.3 --- pdp_3Dcontext_glx.c 1 Sep 2006 13:45:30 -0000 1.4 *************** *** 29,33 **** #include <GL/glx.h> #include <GL/glu.h> - //#include <GL/glut.h>
/* all symbols are C-style */ --- 29,32 ----
Index: setup.c =================================================================== RCS file: /cvsroot/pure-data/externals/pdp/opengl/system/setup.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** setup.c 16 Dec 2005 01:05:36 -0000 1.3 --- setup.c 1 Sep 2006 13:45:30 -0000 1.4 *************** *** 47,54 **** #define D(x) x
void pdp_opengl_setup(void) { int i; ! post("PDP: pdp_opengl extension library");
/* setup system */ --- 47,59 ---- #define D(x) x
+ + void pdp_setup(void); void pdp_opengl_setup(void) { int i; ! ! pdp_setup(); ! ! post("PDP: opengl extensions version " PDP_VERSION);
/* setup system */
Index: pdp_opengl.c =================================================================== RCS file: /cvsroot/pure-data/externals/pdp/opengl/system/pdp_opengl.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** pdp_opengl.c 16 Dec 2005 01:05:36 -0000 1.3 --- pdp_opengl.c 1 Sep 2006 13:45:30 -0000 1.4 *************** *** 57,60 **** --- 57,61 ---- }
+ /* kernel setup */ void pdp_opengl_system_setup(void) *************** *** 69,72 **** --- 70,74 ---- /* add pdp_control method for thread */ pdp_control_addmethod((t_method)pdp_control_thread, gensym("3dthread")); + }