From 115dc28c9cabe9e5d35bcb881f7ae93d76f05ea1 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 19 Dec 2014 10:54:00 -0800
Subject: [PATCH] add glu includes on OS X to stopgap GLUT removal

---
 interface/src/Hair.cpp                  | 5 ++++-
 interface/src/avatar/Avatar.cpp         | 5 +++++
 interface/src/ui/ApplicationOverlay.cpp | 5 +++++
 interface/src/ui/RearMirrorTools.cpp    | 5 +++++
 4 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/interface/src/Hair.cpp b/interface/src/Hair.cpp
index cb664f39ed..c2d3f78b98 100644
--- a/interface/src/Hair.cpp
+++ b/interface/src/Hair.cpp
@@ -10,11 +10,14 @@
 //
 //  Creates single flexible verlet-integrated strands that can be used for hair/fur/grass
 
-#include "Hair.h"
+#include <gpu/GPUConfig.h>
 
 #include "Util.h"
 #include "world.h"
 
+#include "Hair.h"
+
+
 const float HAIR_DAMPING = 0.99f;
 const float CONSTRAINT_RELAXATION = 10.0f;
 const float HAIR_ACCELERATION_COUPLING = 0.045f;
diff --git a/interface/src/avatar/Avatar.cpp b/interface/src/avatar/Avatar.cpp
index 39c528d080..aa94b21d71 100644
--- a/interface/src/avatar/Avatar.cpp
+++ b/interface/src/avatar/Avatar.cpp
@@ -13,6 +13,11 @@
 
 #include <gpu/GPUConfig.h>
 
+// TODO: remove calls to gluProject to remove this include
+#ifdef __APPLE__
+#include <OpenGL/glu.h>
+#endif
+
 #include <QDesktopWidget>
 #include <QWindow>
 
diff --git a/interface/src/ui/ApplicationOverlay.cpp b/interface/src/ui/ApplicationOverlay.cpp
index ab85da125c..f82b44a403 100644
--- a/interface/src/ui/ApplicationOverlay.cpp
+++ b/interface/src/ui/ApplicationOverlay.cpp
@@ -11,6 +11,11 @@
 
 #include "InterfaceConfig.h"
 
+// TODO: remove calls to gluProject to remove this include
+#ifdef __APPLE__
+#include <OpenGL/glu.h>
+#endif
+
 #include <QOpenGLFramebufferObject>
 
 #include <PathUtils.h>
diff --git a/interface/src/ui/RearMirrorTools.cpp b/interface/src/ui/RearMirrorTools.cpp
index fd3fc34adb..2c671ef548 100644
--- a/interface/src/ui/RearMirrorTools.cpp
+++ b/interface/src/ui/RearMirrorTools.cpp
@@ -11,6 +11,11 @@
 
 #include "InterfaceConfig.h"
 
+// TODO: remove calls to gluProject to remove this include
+#ifdef __APPLE__
+#include <OpenGL/glu.h>
+#endif
+
 #include <QMouseEvent>
 
 #include <PathUtils.h>