diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-01-13 11:23:05 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-01-13 11:23:05 -0300 |
| commit | 823d7ae3b554100fc35c6223568452c8fa7adf11 (patch) | |
| tree | c2feed7fcbf86d534dde179bcc2e1b924d0e2187 /drivers/gl_context | |
| parent | 7c7ab30c4ef74f3e7a90ab6d23d69d545fac7cf3 (diff) | |
| parent | 869f400179a32e951a44181165de48094693e280 (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'drivers/gl_context')
| -rw-r--r-- | drivers/gl_context/context_gl.cpp | 2 | ||||
| -rw-r--r-- | drivers/gl_context/context_gl.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gl_context/context_gl.cpp b/drivers/gl_context/context_gl.cpp index 77a94f9333..82195cc6f6 100644 --- a/drivers/gl_context/context_gl.cpp +++ b/drivers/gl_context/context_gl.cpp @@ -12,7 +12,7 @@ #include "context_gl.h" -#if defined(OPENGL_ENABLED) || defined(LEGACYGL_ENABLED) || defined(GLES2_ENABLED) || defined(GLES1_ENABLED) +#if defined(OPENGL_ENABLED) || defined(GLES2_ENABLED) diff --git a/drivers/gl_context/context_gl.h b/drivers/gl_context/context_gl.h index 4c3d863e87..392f8341ae 100644 --- a/drivers/gl_context/context_gl.h +++ b/drivers/gl_context/context_gl.h @@ -29,7 +29,7 @@ #ifndef CONTEXT_GL_H #define CONTEXT_GL_H -#if defined(OPENGL_ENABLED) || defined(LEGACYGL_ENABLED) || defined(GLES2_ENABLED) || defined(GLES1_ENABLED) +#if defined(OPENGL_ENABLED) || defined(GLES2_ENABLED) #include "typedefs.h" |