X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fbubble3d.h;h=70919c347a04503c6838ef8580dc699331fa9051;hb=f8cf5ac7b2f53510f80a0eaf286a25298be17bfe;hp=72ef5a50420d11136031ddb4e473f2f73dc21ec8;hpb=49f5b54f312fe4ac2e9bc47581a72451bd0e8439;p=xscreensaver

diff --git a/hacks/glx/bubble3d.h b/hacks/glx/bubble3d.h
index 72ef5a50..70919c34 100644
--- a/hacks/glx/bubble3d.h
+++ b/hacks/glx/bubble3d.h
@@ -3,6 +3,10 @@
 #ifndef __bubbles3d_h__
 #define __bubbles3d_h__
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif /* HAVE_CONFIG_H */
+
 #ifdef STANDALONE
 # include <math.h>
 # include "xlockmoreI.h"	/* from the xscreensaver distribution */
@@ -10,14 +14,15 @@
 # include "xlock.h"		/* from the xlockmore distribution */
 #endif /* !STANDALONE */
 
-#ifdef HAVE_COCOA
-# include <OpenGL/gl.h>
-# include <OpenGL/glu.h>
-#else
+#ifndef HAVE_COCOA
 # include <GL/gl.h>
 # include <GL/glu.h>
 #endif
 
+#ifdef HAVE_JWZGLES
+# include "jwzgles.h"
+#endif /* HAVE_JWZGLES */
+
 /* Static configuration. */
 #define GLB_SLOW_GL          0	/* Set this if you have a slow GL
 				   * implementation. If you have an accelerated
@@ -60,7 +65,6 @@ struct glb_config {
 					 */
 	GLfloat     screen_bottom;	/* Bottom of screen. */
 	GLfloat     screen_top;	/* Top of screen. */
-	GLfloat     bg_colour[4];	/* Background colour. */
 	GLfloat     bubble_colour[4];	/* Colour of the bubbles. */
 
 	int         polygon_count;