diff --git a/Fltk/Draw.cpp b/Fltk/Draw.cpp index 5582a29b4a1fb2b744035b430632d7feb2055cc6..5faf16e6649a4c9b861056e211733ca717a34267 100644 --- a/Fltk/Draw.cpp +++ b/Fltk/Draw.cpp @@ -4,7 +4,15 @@ // bugs and problems to <gmsh@geuz.org>. #include <FL/gl.h> -#include <FL/glu.h> + +//FIXME: workaround faulty fltk installs +//#include <FL/glu.h> +#ifdef __APPLE__ +# include <OpenGL/glu.h> +#else +# include <GL/glu.h> +#endif + #include "GUI.h" #include "graphicWindow.h" #include "GmshDefines.h" diff --git a/Graphics/drawContext.cpp b/Graphics/drawContext.cpp index ee8cc50d0906b4d79e5a9e24dea72f6b39f140a0..9cf2dbce3d1dfde54fbaec0ea303f1465d8272e5 100644 --- a/Graphics/drawContext.cpp +++ b/Graphics/drawContext.cpp @@ -4,7 +4,15 @@ // bugs and problems to <gmsh@geuz.org>. #include <FL/gl.h> -#include <FL/glu.h> + +//FIXME: workaround faulty fltk installs +//#include <FL/glu.h> +#ifdef __APPLE__ +# include <OpenGL/glu.h> +#else +# include <GL/glu.h> +#endif + #include "GmshMessage.h" #include "Draw.h" #include "drawContext.h" diff --git a/Graphics/drawGlyph.cpp b/Graphics/drawGlyph.cpp index 6d2da6e5673ffac3e41563648ff539570f98d8cd..1564fa674d58a5b6dedee259f9f3f6621e116751 100644 --- a/Graphics/drawGlyph.cpp +++ b/Graphics/drawGlyph.cpp @@ -5,7 +5,15 @@ #include <string.h> #include <FL/gl.h> -#include <FL/glu.h> + +//FIXME: workaround faulty fltk installs +//#include <FL/glu.h> +#ifdef __APPLE__ +# include <OpenGL/glu.h> +#else +# include <GL/glu.h> +#endif + #include "drawContext.h" #include "Numeric.h" #include "Draw.h" diff --git a/Plugin/CutSphere.cpp b/Plugin/CutSphere.cpp index 96e0f989bb4d7b33b1f344caebd94a3616b028de..96aacecd81316e1e763815b2721284b67028df5a 100644 --- a/Plugin/CutSphere.cpp +++ b/Plugin/CutSphere.cpp @@ -9,7 +9,15 @@ #if defined(HAVE_FLTK) #include <FL/gl.h> -#include <FL/glu.h> + +//FIXME: workaround faulty fltk installs +//#include <FL/glu.h> +#ifdef __APPLE__ +# include <OpenGL/glu.h> +#else +# include <GL/glu.h> +#endif + #include "Draw.h" #endif