Mercurial > octave
comparison 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 |
comparison
equal
deleted
inserted
replaced
21195:53ac24e210e4 | 21196:bd96c2efd4fe |
---|---|
21 */ | 21 */ |
22 | 22 |
23 #if ! defined (octave_gl_render_h) | 23 #if ! defined (octave_gl_render_h) |
24 #define octave_gl_render_h 1 | 24 #define octave_gl_render_h 1 |
25 | 25 |
26 #ifdef HAVE_WINDOWS_H | |
27 #define WIN32_LEAN_AND_MEAN | |
28 #include <windows.h> | |
29 #endif | |
30 | |
31 #ifdef HAVE_GL_GL_H | |
32 #include <GL/gl.h> | |
33 #elif defined HAVE_OPENGL_GL_H || defined HAVE_FRAMEWORK_OPENGL | |
34 #include <OpenGL/gl.h> | |
35 #endif | |
36 | |
37 #ifdef HAVE_GL_GLU_H | |
38 #include <GL/glu.h> | |
39 #elif defined HAVE_OPENGL_GLU_H || defined HAVE_FRAMEWORK_OPENGL | |
40 #include <OpenGL/glu.h> | |
41 #endif | |
42 | |
43 #ifdef HAVE_GL_GLEXT_H | |
44 #include <GL/glext.h> | |
45 #elif defined HAVE_OPENGL_GLEXT_H || defined HAVE_FRAMEWORK_OPENGL | |
46 #include <OpenGL/glext.h> | |
47 #endif | |
48 | |
49 #include "graphics.h" | 26 #include "graphics.h" |
27 #include "oct-opengl.h" | |
50 #include "txt-eng-ft.h" | 28 #include "txt-eng-ft.h" |
51 | 29 |
52 #if defined (HAVE_OPENGL) | 30 #if defined (HAVE_OPENGL) |
53 | 31 |
54 class | 32 class |