projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add support for X11+EGL.
[freeglut]
/
include
/
GL
/
freeglut_std.h
diff --git
a/include/GL/freeglut_std.h
b/include/GL/freeglut_std.h
index
f77497e
..
8bcfbd4
100644
(file)
--- a/
include/GL/freeglut_std.h
+++ b/
include/GL/freeglut_std.h
@@
-119,6
+119,9
@@
/*
* Always include OpenGL and GLU headers
*/
/*
* 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
+ (e.g. GL_ES_VERSION_2_0) for all other needs */
#ifdef FREEGLUT_GLES2
# include <EGL/egl.h>
# include <GLES2/gl2.h>
#ifdef FREEGLUT_GLES2
# include <EGL/egl.h>
# include <GLES2/gl2.h>
@@
-523,7
+526,7
@@
FGAPI int FGAPIENTRY glutStrokeLength( void* font, const unsigned char* stri
*/
#ifdef EGL_VERSION_1_0
/* TODO: temporary work-around for missing GLdouble in GLES */
*/
#ifdef EGL_VERSION_1_0
/* TODO: temporary work-around for missing GLdouble in GLES */
-# define GLdouble GLfloat
+# define GLdouble GLfloat
#endif
FGAPI void FGAPIENTRY glutWireCube( GLdouble size );
#endif
FGAPI void FGAPIENTRY glutWireCube( GLdouble size );
@@
-550,6
+553,11
@@
FGAPI void FGAPIENTRY glutSolidIcosahedron( void );
FGAPI void FGAPIENTRY glutWireTeapot( GLdouble size );
FGAPI void FGAPIENTRY glutSolidTeapot( GLdouble size );
FGAPI void FGAPIENTRY glutWireTeapot( GLdouble size );
FGAPI void FGAPIENTRY glutSolidTeapot( GLdouble size );
+#ifdef EGL_VERSION_1_0
+/* TODO: temporary work-around for missing GLdouble in GLES */
+# undef GLdouble
+#endif
+
/*
* Game mode functions, see freeglut_gamemode.c
*/
/*
* Game mode functions, see freeglut_gamemode.c
*/