Merge pull request #949 from YunfeiBai/master

EGL OpenGL window.
This commit is contained in:
erwincoumans authored and GitHub committed 2017-02-07 08:39:12 -08:00
commit 9705bb7681
8 files changed
+223 -132

No files matched your search

@@ -10,12 +10,18 @@
#include <OpenGL/OpenGL.h>
#include <OpenGL/gl.h>
#else
#ifdef GLEW_STATIC
#include "CustomGL/glew.h"
#else
#include <GL/glew.h>
#endif
#endif
#ifdef GLEW_STATIC
#include "CustomGL/glew.h"
#else
#ifdef NO_GLEW
#define GL_GLEXT_LEGACY
#include "third_party/GL/gl/include/GL/gl.h"
#include "third_party/GL/gl/include/GL/glext.h"
#else
#include <GL/glew.h>
#endif //NO_GLEW
#endif //GLEW_STATIC
#endif//(__APPLE__)
#include "FontData.h"