Skip to content

Commit 513a177

Browse files
committed
Merge pull request #399 from nneonneo/glut-include-fix
Fix a micview compile error on OS X
2 parents 1692131 + 47301ac commit 513a177

File tree

6 files changed

+7
-23
lines changed

6 files changed

+7
-23
lines changed

examples/chunkview.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,8 @@
3535

3636
#if defined(__APPLE__)
3737
#include <GLUT/glut.h>
38-
#include <OpenGL/gl.h>
39-
#include <OpenGL/glu.h>
4038
#else
4139
#include <GL/glut.h>
42-
#include <GL/gl.h>
43-
#include <GL/glu.h>
4440
#endif
4541

4642
#include <math.h>

examples/glpclview.c

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,13 @@
3030
#include "libfreenect_sync.h"
3131
#include <stdio.h>
3232
#include <stdlib.h>
33+
#include <math.h>
3334

3435
#if defined(__APPLE__)
3536
#include <GLUT/glut.h>
36-
#include <OpenGL/gl.h>
37-
#include <OpenGL/glu.h>
3837
#else
3938
#include <GL/glut.h>
40-
#include <GL/gl.h>
41-
#include <GL/glu.h>
4239
#endif
43-
#include <stdlib.h>
44-
#include <math.h>
4540

4641
int window;
4742
GLuint gl_rgb_tex;

examples/glview.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,8 @@
3535

3636
#if defined(__APPLE__)
3737
#include <GLUT/glut.h>
38-
#include <OpenGL/gl.h>
39-
#include <OpenGL/glu.h>
4038
#else
4139
#include <GL/glut.h>
42-
#include <GL/gl.h>
43-
#include <GL/glu.h>
4440
#endif
4541

4642
#include <math.h>

examples/hiview.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,8 @@
3535

3636
#if defined(__APPLE__)
3737
#include <GLUT/glut.h>
38-
#include <OpenGL/gl.h>
39-
#include <OpenGL/glu.h>
4038
#else
4139
#include <GL/glut.h>
42-
#include <GL/gl.h>
43-
#include <GL/glu.h>
4440
#endif
4541

4642
#include <math.h>

examples/micview.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,12 @@
3030
#include <string.h>
3131
#include <signal.h>
3232
#include <pthread.h>
33+
34+
#if defined(__APPLE__)
35+
#include <GLUT/glut.h>
36+
#else
3337
#include <GL/glut.h>
38+
#endif
3439

3540
pthread_t freenect_thread;
3641
volatile int die = 0;

examples/regview.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,14 @@
3232
#include "libfreenect.h"
3333

3434
#include <pthread.h>
35+
#include <math.h>
3536

3637
#if defined(__APPLE__)
3738
#include <GLUT/glut.h>
38-
#include <OpenGL/gl.h>
39-
#include <OpenGL/glu.h>
4039
#else
4140
#include <GL/glut.h>
42-
#include <GL/gl.h>
43-
#include <GL/glu.h>
4441
#endif
4542

46-
#include <math.h>
4743

4844
pthread_t freenect_thread;
4945
volatile int die = 0;

0 commit comments

Comments
 (0)