Zengtudor
/
glfw
mirror of https://github.com/glfw/glfw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'EGL' of github.com:elmindreda/glfw into EGL 

Conflicts:
	include/GL/glfw3.h
This commit is contained in:
Camilla Berglund 2012-11-27 12:23:25 +01:00
parent e4ddcefc14 8d2043821f
commit 0f0f7f7294
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/GL/glfw3.h
View File

@ -188,6 +188,8 @@ 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