X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fglschool_gl.h;h=c5e2d384ee77eb59cbe3233e949eed10cee58f0a;hb=aa75c7476aeaa84cf3abc192b376a8b03c325213;hp=7676a0fd3febc782011181d4e86b9c23ea44de3f;hpb=f8cf5ac7b2f53510f80a0eaf286a25298be17bfe;p=xscreensaver

diff --git a/hacks/glx/glschool_gl.h b/hacks/glx/glschool_gl.h
index 7676a0fd..c5e2d384 100644
--- a/hacks/glx/glschool_gl.h
+++ b/hacks/glx/glschool_gl.h
@@ -15,7 +15,7 @@
 # include "config.h"
 #endif /* HAVE_CONFIG_H */
 
-#ifdef HAVE_COCOA
+#ifdef HAVE_JWXYZ
 # include "jwxyz.h"
 # ifndef HAVE_JWZGLES
 #  include <OpenGL/glu.h>
@@ -26,22 +26,26 @@
 # include <GL/glu.h>
 #endif
 
+#ifdef HAVE_ANDROID
+#include <GLES/gl.h>
+#endif
+
 #ifdef HAVE_JWZGLES
 # include "jwzgles.h"
 #endif /* HAVE_JWZGLES */
 
 #include "glschool_alg.h"
 
-extern void initFog(void);
-extern void initGLEnv(Bool);
-extern void initLights(void);
-extern void reshape(int, int);
-extern void drawGoal(double *, GLuint);
-extern void getColorVect(XColor *, int, double *);
-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, 
+extern void glschool_initFog(void);
+extern void glschool_initGLEnv(Bool);
+extern void glschool_initLights(void);
+extern void glschool_reshape(int, int);
+extern void glschool_drawGoal(double *, GLuint);
+extern void glschool_getColorVect(XColor *, int, double *);
+extern int glschool_drawBoundingBox(BBox *, Bool);
+extern int glschool_createBBoxList(BBox *, GLuint *, int);
+extern void glschool_createDrawLists(BBox *, GLuint *, GLuint *, GLuint *, int *, int *, Bool);
+extern void glschool_drawSchool(XColor *, School *, GLuint, GLuint, GLuint, int, Bool, Bool, 
                        int, int, unsigned long *);
 
 #endif /* __GLSCHOOL_GL_H__ */