From 08142a8adbb3e9f80484836d2b1208407fb08701 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 8 Feb 2013 14:57:59 -0800
Subject: [PATCH] add header for glut to conditional include in InterfaceConfig

---
 interface/CMakeLists.txt       | 6 ++----
 interface/InterfaceConfig.h.in | 4 ++--
 interface/src/Head.cpp         | 1 -
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index 30f89bfe34..6a23f1a0f3 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -4,11 +4,9 @@ project(interface)
 
 if (APPLE)
     set(CMAKE_EXE_LINKER_FLAGS "-framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework CoreServices -framework Carbon")
-    set(GLUT_HEADER_INCLUDE "<GLUT/glut.h>")
-    set(GL_EXT_INCLUDE "<OpenGL/glext.h>")
+    set(GL_HEADERS "#include <GLUT/glut.h>\n#include <OpenGL/glext.h>")
 else (APPLE)
-    set(GLUT_HEADER_INCLUDE "<GL/gl.h>")
-    set(GL_EXT_INCLUDE "<GL/glext.h>")
+    set(GL_HEADERS "#include <GLUT/gl.h>\n#include <GLUT/glut.h>\n#include <GL/glext.h>")
 endif (APPLE)
 
 configure_file(InterfaceConfig.h.in ${PROJECT_BINARY_DIR}/includes/InterfaceConfig.h)
diff --git a/interface/InterfaceConfig.h.in b/interface/InterfaceConfig.h.in
index 0084216b1e..802574434c 100644
--- a/interface/InterfaceConfig.h.in
+++ b/interface/InterfaceConfig.h.in
@@ -10,7 +10,7 @@
 #define interface__InterfaceConfig__
 
 #define GL_GLEXT_PROTOTYPES 1
-#include @GLUT_HEADER_INCLUDE@
-#include @GL_EXT_INCLUDE@
+@GL_HEADERS@
+
 
 #endif
diff --git a/interface/src/Head.cpp b/interface/src/Head.cpp
index 3460d23615..8e915b3de0 100644
--- a/interface/src/Head.cpp
+++ b/interface/src/Head.cpp
@@ -9,7 +9,6 @@
 #include <iostream>
 #include <glm/glm.hpp>
 #include <cstring>
-#include "InterfaceConfig.h"
 #include "Head.h"
 #include "Util.h"
 #include "SerialInterface.h"