Mercurial > octave

diff libinterp/dldfcn/__osmesa_print__.cc @ 19732:bf25e9f7c22a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use FLTK_CFLAGS and FLTK_LIBS instead of GRAPHICS_CFLAGS and GRAPHICS_LIBS * common.mk, configure.ac, toplev.cc, __osmesa_print__.cc, libinterp/dldfcn/module-files, oct-conf.in.h: Use FLTK_CFLAGS and FLTK_LIBS instead of GRAPHICS_CFLAGS and GRAPHICS_LIBS.
author John W. Eaton <jwe@octave.org>
date Tue, 17 Feb 2015 14:10:46 -0500
parents ce0a1bd0cd47
children 84772c272288
line wrap: on
line diff
--- a/libinterp/dldfcn/__osmesa_print__.cc	Tue Feb 17 20:13:29 2015 +0100
+++ b/libinterp/dldfcn/__osmesa_print__.cc	Tue Feb 17 14:10:46 2015 -0500
@@ -36,9 +36,13 @@
 #include "graphics.h"
 #include "gripes.h"
 
-#ifdef HAVE_OSMESA
+#if defined (HAVE_OSMESA_H)
+#include "osmesa.h"
+#elif defined (HAVE_GL_OSMESA_H)
 #include "GL/osmesa.h"
+#endif
 
+#if defined (HAVE_OSMESA) && defined (HAVE_OPENGL)
 static void
 close_fcn (FILE *f)
 {
@@ -73,7 +77,7 @@
 {
   octave_value_list retval;
 
-#ifndef HAVE_OSMESA
+#if ! defined (HAVE_OSMESA)
   gripe_disabled_feature ("__osmesa_print__", "Offscreen rendering");
 #else