Mercurial > octave-nkf

changeset 18900:95b69b880b19 gui-release

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Allow conpile of gl-render.cc under mingw. * libinterp/corefcn/gl-render.h: include glext.h if available * acinclude.m4: add configure check og glext.h
author John Donoghue
date Thu, 26 Jun 2014 14:42:55 -0400
parents fc0f3b6c37a9
children 589354cf668f
files libinterp/corefcn/gl-render.h m4/acinclude.m4
diffstat 2 files changed, 16 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/gl-render.h	Mon Jun 23 22:06:04 2014 +0200
+++ b/libinterp/corefcn/gl-render.h	Thu Jun 26 14:42:55 2014 -0400
@@ -40,6 +40,12 @@
 #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 "txt-eng-ft.h"
 
--- a/m4/acinclude.m4	Mon Jun 23 22:06:04 2014 +0200
+++ b/m4/acinclude.m4	Thu Jun 26 14:42:55 2014 -0400
@@ -937,6 +937,16 @@
     ])
 
     if test $have_opengl_incs = yes; then
+      AC_CHECK_HEADERS([GL/glext.h OpenGL/glext.h], [], [], [
+#ifdef HAVE_WINDOWS_H
+# include <windows.h>
+#endif
+#if defined (HAVE_GL_GL_H)
+# include <GL/gl.h>
+#elif defined (HAVE_OPENGL_GL_H)
+# include <OpenGL/gl.h>
+#endif
+      ])
       case $canonical_host_type in
         *-*-mingw32* | *-*-msdosmsvc)
           save_LIBS="$LIBS"