MAC compat

core/imagedisplay/ArrayPlot.cpp

@@ -16,8 +16,13 @@
 #include <core/basics/numerictools.h>
 
 #ifdef NICE_USELIB_GLUT
+#ifdef __APPLE__
+#include <OpenGL/gl.h>
+#include <OpenGL/glu.h>
+#else
 #include <GL/glut.h>
 #endif
+#endif
 
 namespace NICE {
 

core/imagedisplay/EpipolarGeometryDisplay.cpp

@@ -14,8 +14,13 @@
 #include <QGridLayout>
 
 #ifdef NICE_USELIB_GLUT
+#ifdef __APPLE__
+#include <OpenGL/gl.h>
+#include <OpenGL/glu.h>
+#else
 #include <GL/glut.h>
 #endif
+#endif
 
 namespace NICE {
 

core/imagedisplay/ImageDisplay.cpp

@@ -6,9 +6,16 @@
 #include "core/imagedisplay/ImageDisplay.h"
 
 #include <iostream>
+
 #ifdef NICE_USELIB_GLUT
+#ifdef __APPLE__
+#include <OpenGL/gl.h>
+#include <OpenGL/glu.h>
+#else
 #include <GL/glut.h>
 #endif
+#endif
+
 #include <qcursor.h>
 #include <q3filedialog.h>
 #include <qapplication.h>

core/imagedisplay/QtFramework.cpp

@@ -5,10 +5,17 @@
  */
 #include "core/imagedisplay/QtFramework.h"
 #include "core/imagedisplay/DefaultMainWindow.h"
+
 #ifdef NICE_USELIB_GLUT
-	#include <GL/glut.h>
+#ifdef __APPLE__
+#include <OpenGL/gl.h>
+#include <OpenGL/glu.h>
+#else
+#include <GL/glut.h>
+#endif
 #endif
 
+
 namespace NICE {
 
 std::auto_ptr<QtFramework> QtFramework::theInstance;

libtests/test-glut.cpp

@@ -1,2 +1,7 @@
+#ifdef __APPLE__
+#include <OpenGL/gl.h>
+#include <OpenGL/glu.h>
+#else
 #include <GL/glut.h>
+#endif
 int main(){}