Mercurial > hg > octave-nkf

comparison libinterp/corefcn/gl-render.h @ 19058:2b82d2f29a7b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Periodic merge of gui-release to default.
author John W. Eaton <jwe@octave.org>
date Fri, 27 Jun 2014 11:56:19 -0400
parents 75f8926deef1 95b69b880b19
children 4197fc428c7d
comparison
equal deleted inserted replaced
19055:a0fd65914811 19058:2b82d2f29a7b
36 36
37 #ifdef HAVE_GL_GLU_H 37 #ifdef HAVE_GL_GLU_H
38 #include <GL/glu.h> 38 #include <GL/glu.h>
39 #elif defined HAVE_OPENGL_GLU_H || defined HAVE_FRAMEWORK_OPENGL 39 #elif defined HAVE_OPENGL_GLU_H || defined HAVE_FRAMEWORK_OPENGL
40 #include <OpenGL/glu.h> 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>
41 #endif 47 #endif
42 48
43 #include "graphics.h" 49 #include "graphics.h"
44 #include "txt-eng-ft.h" 50 #include "txt-eng-ft.h"
45 51