From 6b39783de7ae579191d927e6ecf27542fb955a10 Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Mon, 15 Dec 2014 10:12:04 -0800
Subject: [PATCH] revert out the InterfaceConfig.h changes

---
 interface/src/Application.h             | 3 ---
 interface/src/renderer/GeometryCache.h  | 2 +-
 interface/src/renderer/TextureCache.cpp | 2 +-
 interface/src/renderer/TextureCache.h   | 2 +-
 interface/src/voxels/VoxelSystem.cpp    | 2 +-
 5 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/interface/src/Application.h b/interface/src/Application.h
index fe5c466e0e..d4a681f060 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -12,9 +12,6 @@
 #ifndef hifi_Application_h
 #define hifi_Application_h
 
-// include this before QGLWidget, which includes an earlier version of OpenGL
-#include "InterfaceConfig.h"
-
 #include <map>
 #include <time.h>
 
diff --git a/interface/src/renderer/GeometryCache.h b/interface/src/renderer/GeometryCache.h
index f50dc8ccd9..1eb9dcbc6a 100644
--- a/interface/src/renderer/GeometryCache.h
+++ b/interface/src/renderer/GeometryCache.h
@@ -13,7 +13,7 @@
 #define hifi_GeometryCache_h
 
 // include this before QOpenGLBuffer, which includes an earlier version of OpenGL
-#include <gpu/GPUConfig.h>
+#include "InterfaceConfig.h"
 
 #include <QMap>
 #include <QOpenGLBuffer>
diff --git a/interface/src/renderer/TextureCache.cpp b/interface/src/renderer/TextureCache.cpp
index e4c55db58b..4d246a4c9c 100644
--- a/interface/src/renderer/TextureCache.cpp
+++ b/interface/src/renderer/TextureCache.cpp
@@ -10,7 +10,7 @@
 //
 
 // include this before QGLWidget, which includes an earlier version of OpenGL
-#include <gpu/GPUConfig.h>
+#include "InterfaceConfig.h"
 
 #include <QEvent>
 #include <QGLWidget>
diff --git a/interface/src/renderer/TextureCache.h b/interface/src/renderer/TextureCache.h
index 3808485135..3cbfaced49 100644
--- a/interface/src/renderer/TextureCache.h
+++ b/interface/src/renderer/TextureCache.h
@@ -18,7 +18,7 @@
 
 #include <ResourceCache.h>
 
-#include <gpu/GPUConfig.h>
+#include "InterfaceConfig.h"
 
 class QOpenGLFramebufferObject;
 
diff --git a/interface/src/voxels/VoxelSystem.cpp b/interface/src/voxels/VoxelSystem.cpp
index 3a50c07a71..82384ce9a4 100644
--- a/interface/src/voxels/VoxelSystem.cpp
+++ b/interface/src/voxels/VoxelSystem.cpp
@@ -9,6 +9,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include <gpu/GPUConfig.h> // include this first
 
 #include <cstring>
 #include <cmath>
@@ -24,7 +25,6 @@
 #include <glm/gtc/type_ptr.hpp>
 
 #include "Application.h"
-#include "InterfaceConfig.h"
 #include "Menu.h"
 #include "renderer/ProgramObject.h"
 #include "VoxelConstants.h"