Mercurial > octave
diff libinterp/corefcn/gl-render.h @ 21196:bd96c2efd4fe
move include statements for OpenGL headers to a single file
* oct-opengl.h: New file.
* libinterp/corefcn/module.mk: Update.
* Canvas.cc, gl-select.cc, gl-select.h, gl-render.cc, gl-render.h,
gl2ps-renderer.cc, __init_fltk__.cc, __osmesa_print__.cc:
Update include statements.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 04 Feb 2016 16:56:02 -0500 |
| parents | 53ac24e210e4 |
| children | 1adcdc518d9e |
line wrap: on
line diff
--- a/libinterp/corefcn/gl-render.h Thu Feb 04 16:02:44 2016 -0500 +++ b/libinterp/corefcn/gl-render.h Thu Feb 04 16:56:02 2016 -0500 @@ -23,30 +23,8 @@ #if ! defined (octave_gl_render_h) #define octave_gl_render_h 1 -#ifdef HAVE_WINDOWS_H -#define WIN32_LEAN_AND_MEAN -#include <windows.h> -#endif - -#ifdef HAVE_GL_GL_H -#include <GL/gl.h> -#elif defined HAVE_OPENGL_GL_H || defined HAVE_FRAMEWORK_OPENGL -#include <OpenGL/gl.h> -#endif - -#ifdef HAVE_GL_GLU_H -#include <GL/glu.h> -#elif defined HAVE_OPENGL_GLU_H || defined HAVE_FRAMEWORK_OPENGL -#include <OpenGL/glu.h> -#endif - -#ifdef HAVE_GL_GLEXT_H -#include <GL/glext.h> -#elif defined HAVE_OPENGL_GLEXT_H || defined HAVE_FRAMEWORK_OPENGL -#include <OpenGL/glext.h> -#endif - #include "graphics.h" +#include "oct-opengl.h" #include "txt-eng-ft.h" #if defined (HAVE_OPENGL)