projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Unify GLES1 and GLES2 (libraries are compatible and can be co-linked)
[freeglut]
/
include
/
GL
/
freeglut_std.h
diff --git
a/include/GL/freeglut_std.h
b/include/GL/freeglut_std.h
index
9fded35
..
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
*/
/*
* 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 */
(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 <EGL/egl.h>
# include <GLES/gl.h>
+# include <GLES2/gl2.h>
#elif __APPLE__
# include <OpenGL/gl.h>
# include <OpenGL/glu.h>
#elif __APPLE__
# include <OpenGL/gl.h>
# include <OpenGL/glu.h>