From ca39c79df45cd350656999a181e0ab22fb394721 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Mon, 15 Dec 2014 08:50:36 -0800 Subject: [PATCH] unix compile --- interface/src/renderer/GeometryCache.cpp | 6 ++++-- interface/src/renderer/TextureCache.cpp | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/interface/src/renderer/GeometryCache.cpp b/interface/src/renderer/GeometryCache.cpp index 416148ab20..5cb544135c 100644 --- a/interface/src/renderer/GeometryCache.cpp +++ b/interface/src/renderer/GeometryCache.cpp @@ -9,6 +9,9 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // +// include this before QOpenGLBuffer, which includes an earlier version of OpenGL +#include + #include #include @@ -17,9 +20,8 @@ #include -#include "TextureCache.h" - #include "GeometryCache.h" +#include "TextureCache.h" GeometryCache* GeometryCache::getInstance() { static GeometryCache instance; diff --git a/interface/src/renderer/TextureCache.cpp b/interface/src/renderer/TextureCache.cpp index 11ccd4b797..e4c55db58b 100644 --- a/interface/src/renderer/TextureCache.cpp +++ b/interface/src/renderer/TextureCache.cpp @@ -10,6 +10,7 @@ // // include this before QGLWidget, which includes an earlier version of OpenGL +#include #include #include