Mercurial > octave-nkf
changeset 7945:456578a22388
check for OpenGL/gl[u].h
| author | carlo@guglielmo.local |
|---|---|
| date | Fri, 18 Jul 2008 19:22:41 +0200 |
| parents | c2449e91f50a |
| children | ebe275f82bd5 |
| files | ChangeLog aclocal.m4 src/ChangeLog src/gl-render.h |
| diffstat | 4 files changed, 22 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Jul 18 14:08:44 2008 -0400 +++ b/ChangeLog Fri Jul 18 19:22:41 2008 +0200 @@ -1,3 +1,7 @@ +2008-07-18 Carlo de Falco <carlo.defalco@gmail.com> + + * aclocal.m4: Search for gl.h and glu.h in OpenGL/ as well as in GL/. + 2008-07-18 John W. Eaton <jwe@octave.org> * configure.in: Fix FTGL test to handle either FTGL/ftgl.h or ftgl.h.
--- a/aclocal.m4 Fri Jul 18 14:08:44 2008 -0400 +++ b/aclocal.m4 Fri Jul 18 19:22:41 2008 +0200 @@ -1066,12 +1066,12 @@ ;; esac have_opengl_incs=no -AC_CHECK_HEADERS(GL/gl.h, [ - AC_CHECK_HEADERS(GL/glu.h, [ - have_opengl_incs=yes], [], [ +AC_CHECK_HEADERS(GL/gl.h OpenGL/gl.h, [ + AC_CHECK_HEADERS(GL/glu.h OpenGL/glu.h, [ + have_opengl_incs=yes, break], [], [ #ifdef HAVE_WINDOWS_H # include <windows.h> -#endif])], [], [ +#endif ]), break], [], [ #ifdef HAVE_WINDOWS_H # include <windows.h> #endif])
--- a/src/ChangeLog Fri Jul 18 14:08:44 2008 -0400 +++ b/src/ChangeLog Fri Jul 18 19:22:41 2008 +0200 @@ -1,3 +1,8 @@ +2008-07-18 Carlo de Falco <carlo.defalco@gmail.com> + + * gl-render.h: Conditionally include GL/gl.h or OpenGL/gl.h + and GL/glu.h or OpenGL/glu.h + 2008-07-17 John W. Eaton <jwe@octave.org> * symtab.cc (out_of_date_check_internal): New arg, dispatch_type.
--- a/src/gl-render.h Fri Jul 18 14:08:44 2008 -0400 +++ b/src/gl-render.h Fri Jul 18 19:22:41 2008 +0200 @@ -29,8 +29,17 @@ #include <windows.h> #endif +#ifdef HAVE_GL_GL_H #include <GL/gl.h> +#elif defined HAVE_OPENGL_GL_H +#include <OpenGL/gl.h> +#endif + +#ifdef HAVE_GL_GLU_H #include <GL/glu.h> +#elif defined HAVE_OPENGL_GLU_H +#include <OpenGL/glu.h> +#endif #include "graphics.h"