Rewrite EGL attributes using our ATTRIB/ATTRIB_VAL macros

[freeglut] / include / GL / freeglut_std.h

diff --git a/include/GL/freeglut_std.h b/include/GL/freeglut_std.h
index fc0cb80..b24fced 100644 (file)
--- a/include/GL/freeglut_std.h
+++ b/include/GL/freeglut_std.h
@@ -129,15 +129,13 @@
 /*
  * Always include OpenGL and GLU headers
  */
-/* Note: FREEGLUT_GLES1 and FREEGLUT_GLES2 are only used to cleanly
-   bootstrap headers inclusion here; use GLES constants directly
+/* Note: FREEGLUT_GLES is only used to cleanly bootstrap headers
+   inclusion here; use GLES constants directly
    (e.g. GL_ES_VERSION_2_0) for all other needs */
-#ifdef FREEGLUT_GLES2
-#   include <EGL/egl.h>
-#   include <GLES2/gl2.h>
-#elif FREEGLUT_GLES1
+#ifdef FREEGLUT_GLES
 #   include <EGL/egl.h>
 #   include <GLES/gl.h>
+#   include <GLES2/gl2.h>
 #elif __APPLE__
 #   include <OpenGL/gl.h>
 #   include <OpenGL/glu.h>
@@ -559,10 +557,8 @@ FGAPI void    FGAPIENTRY glutSolidIcosahedron( void );
  * Teapot rendering functions, found in freeglut_teapot.c
  * NB: front facing polygons have clockwise winding, not counter clockwise
  */
-#ifndef EGL_VERSION_1_0
 FGAPI void    FGAPIENTRY glutWireTeapot( double size );
 FGAPI void    FGAPIENTRY glutSolidTeapot( double size );
-#endif
 
 /*
  * Game mode functions, see freeglut_gamemode.c