X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fglx%2Fglschool_gl.h;h=7676a0fd3febc782011181d4e86b9c23ea44de3f;hp=933ee15228f2d127dac5c706af55393af38ee0b4;hb=f8cf5ac7b2f53510f80a0eaf286a25298be17bfe;hpb=ec8d2b32b63649e6d32bdfb306eda062769af823 diff --git a/hacks/glx/glschool_gl.h b/hacks/glx/glschool_gl.h index 933ee152..7676a0fd 100644 --- a/hacks/glx/glschool_gl.h +++ b/hacks/glx/glschool_gl.h @@ -11,16 +11,25 @@ #ifndef __GLSCHOOL_GL_H__ #define __GLSCHOOL_GL_H__ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif /* HAVE_CONFIG_H */ + #ifdef HAVE_COCOA # include "jwxyz.h" -# include -# include +# ifndef HAVE_JWZGLES +# include +# endif #else # include # include # include #endif +#ifdef HAVE_JWZGLES +# include "jwzgles.h" +#endif /* HAVE_JWZGLES */ + #include "glschool_alg.h" extern void initFog(void); @@ -29,9 +38,10 @@ extern void initLights(void); extern void reshape(int, int); extern void drawGoal(double *, GLuint); extern void getColorVect(XColor *, int, double *); -extern void drawBoundingBox(BBox *, Bool); -extern void createBBoxList(BBox *, GLuint *, int); -extern void createDrawLists(BBox *, GLuint *, GLuint *, GLuint *, Bool); -extern void drawSchool(XColor *, School *, GLuint, GLuint, GLuint, int, Bool, Bool); +extern int drawBoundingBox(BBox *, Bool); +extern int createBBoxList(BBox *, GLuint *, int); +extern void createDrawLists(BBox *, GLuint *, GLuint *, GLuint *, int *, int *, Bool); +extern void drawSchool(XColor *, School *, GLuint, GLuint, GLuint, int, Bool, Bool, + int, int, unsigned long *); #endif /* __GLSCHOOL_GL_H__ */