Merge branch 'EGL'

This commit is contained in:
Camilla Berglund
2012-12-02 19:02:49 +01:00
24 changed files with 1659 additions and 227 deletions

View File

@@ -188,6 +188,10 @@ extern "C" {
#else
#if defined(GLFW_INCLUDE_GLCOREARB)
#include <GL/glcorearb.h>
#elif defined(GLFW_INCLUDE_ES1)
#include <GLES/gl.h>
#elif defined(GLFW_INCLUDE_ES2)
#include <GLES2/gl2.h>
#else
#include <GL/gl.h>
#endif