Merge pull request #399 from nneonneo/glut-include-fix

Fix a micview compile error on OS X
OpenKinect · Jul 3, 2014 · 513a177 · 513a177
2 parents 1692131 + 47301ac
commit 513a177
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 23 deletions.
diff --git a/examples/chunkview.c b/examples/chunkview.c
@@ -35,12 +35,8 @@
 
 #if defined(__APPLE__)
 #include <GLUT/glut.h>
-#include <OpenGL/gl.h>
-#include <OpenGL/glu.h>
 #else
 #include <GL/glut.h>
-#include <GL/gl.h>
-#include <GL/glu.h>
 #endif
 
 #include <math.h>

diff --git a/examples/glpclview.c b/examples/glpclview.c
@@ -30,18 +30,13 @@
 #include "libfreenect_sync.h"
 #include <stdio.h>
 #include <stdlib.h>
+#include <math.h>
 
 #if defined(__APPLE__)
 #include <GLUT/glut.h>
-#include <OpenGL/gl.h>
-#include <OpenGL/glu.h>
 #else
 #include <GL/glut.h>
-#include <GL/gl.h>
-#include <GL/glu.h>
 #endif
-#include <stdlib.h>
-#include <math.h>
 
 int window;
 GLuint gl_rgb_tex;

diff --git a/examples/glview.c b/examples/glview.c
@@ -35,12 +35,8 @@
 
 #if defined(__APPLE__)
 #include <GLUT/glut.h>
-#include <OpenGL/gl.h>
-#include <OpenGL/glu.h>
 #else
 #include <GL/glut.h>
-#include <GL/gl.h>
-#include <GL/glu.h>
 #endif
 
 #include <math.h>

diff --git a/examples/hiview.c b/examples/hiview.c
@@ -35,12 +35,8 @@
 
 #if defined(__APPLE__)
 #include <GLUT/glut.h>
-#include <OpenGL/gl.h>
-#include <OpenGL/glu.h>
 #else
 #include <GL/glut.h>
-#include <GL/gl.h>
-#include <GL/glu.h>
 #endif
 
 #include <math.h>

diff --git a/examples/micview.c b/examples/micview.c
@@ -30,7 +30,12 @@
 #include <string.h>
 #include <signal.h>
 #include <pthread.h>
+
+#if defined(__APPLE__)
+#include <GLUT/glut.h>
+#else
 #include <GL/glut.h>
+#endif
 
 pthread_t freenect_thread;
 volatile int die = 0;

diff --git a/examples/regview.c b/examples/regview.c
@@ -32,18 +32,14 @@
 #include "libfreenect.h"
 
 #include <pthread.h>
+#include <math.h>
 
 #if defined(__APPLE__)
 #include <GLUT/glut.h>
-#include <OpenGL/gl.h>
-#include <OpenGL/glu.h>
 #else
 #include <GL/glut.h>
-#include <GL/gl.h>
-#include <GL/glu.h>
 #endif
 
-#include <math.h>
 
 pthread_t freenect_thread;
 volatile int die = 0;