X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=include%2FGL%2Ffreeglut_std.h;h=f77497ea4cb9cb0c4968e18d213b68a73fe63d25;hb=091b26aaa1610f8762beffd84e1e5ae2062b6289;hp=d1cd23f14bcae6e31839d22f1dece74a7c75163d;hpb=6b975bfa34c872ed3287967a385b1f193da99097;p=freeglut

diff --git a/include/GL/freeglut_std.h b/include/GL/freeglut_std.h
index d1cd23f..f77497e 100644
--- a/include/GL/freeglut_std.h
+++ b/include/GL/freeglut_std.h
@@ -119,19 +119,15 @@
 /*
  * Always include OpenGL and GLU headers
  */
-#ifdef ANDROID
-/* Use EGL (implies OpenGL ES) */
-/* TODO: EGL/GLES builds should be more generally defined, possibly by
-   generating this file dynamically */
-#include <EGL/egl.h>
-/* TODO: we probably need 2 builds: -lGLESv1 and -lGLESv2 */
-/* #include <GLES/gl.h> */
-#include <GLES2/gl2.h>
-/* TODO: temporary work-around for e.g. glutWireCube */
-#define GLdouble     GLfloat
+#ifdef FREEGLUT_GLES2
+#   include <EGL/egl.h>
+#   include <GLES2/gl2.h>
+#elif FREEGLUT_GLES1
+#   include <EGL/egl.h>
+#   include <GLES/gl.h>
 #else
-#include <GL/gl.h>
-#include <GL/glu.h>
+#   include <GL/gl.h>
+#   include <GL/glu.h>
 #endif
 
 /*
@@ -525,6 +521,11 @@ FGAPI int     FGAPIENTRY glutStrokeLength( void* font, const unsigned char* stri
 /*
  * Geometry functions, see freeglut_geometry.c
  */
+#ifdef EGL_VERSION_1_0
+/* TODO: temporary work-around for missing GLdouble in GLES */
+#   define GLdouble     GLfloat  
+#endif
+
 FGAPI void    FGAPIENTRY glutWireCube( GLdouble size );
 FGAPI void    FGAPIENTRY glutSolidCube( GLdouble size );
 FGAPI void    FGAPIENTRY glutWireSphere( GLdouble radius, GLint slices, GLint stacks );