From http://www.jwz.org/xscreensaver/xscreensaver-5.35.tar.gz

[xscreensaver] / hacks / glx / bubble3d.h

diff --git a/hacks/glx/bubble3d.h b/hacks/glx/bubble3d.h
index 72ef5a50420d11136031ddb4e473f2f73dc21ec8..92ccbbde064f8f797d39cb0f8935b855bf0af9b9 100644 (file)
--- 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
+#if !defined(HAVE_JWXYZ) && !defined(HAVE_JWZGLES)
 # 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;