From cb1c659e2e5ef8324546aebead94e6a675378907 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Sat, 15 Feb 2014 21:25:20 -0800 Subject: [PATCH] fix windows --- interface/src/ui/ImageOverlay.cpp | 12 +++++++----- interface/src/ui/Overlay.cpp | 7 +++++-- interface/src/ui/TextOverlay.cpp | 2 ++ 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/interface/src/ui/ImageOverlay.cpp b/interface/src/ui/ImageOverlay.cpp index d36099cffc..d048e7a27e 100644 --- a/interface/src/ui/ImageOverlay.cpp +++ b/interface/src/ui/ImageOverlay.cpp @@ -5,14 +5,16 @@ // Copyright (c) 2014 High Fidelity, Inc. All rights reserved. // +// include this before QGLWidget, which includes an earlier version of OpenGL +#include "InterfaceConfig.h" + +#include +#include +#include +#include #include "ImageOverlay.h" -#include -#include -#include -#include - ImageOverlay::ImageOverlay() : _textureID(0), _renderImage(false), diff --git a/interface/src/ui/Overlay.cpp b/interface/src/ui/Overlay.cpp index fa54844477..4660fd6ada 100644 --- a/interface/src/ui/Overlay.cpp +++ b/interface/src/ui/Overlay.cpp @@ -5,14 +5,17 @@ // Copyright (c) 2014 High Fidelity, Inc. All rights reserved. // - -#include "Overlay.h" +// include this before QGLWidget, which includes an earlier version of OpenGL +#include "InterfaceConfig.h" #include #include #include #include +#include "Overlay.h" + + Overlay::Overlay() : _parent(NULL), _alpha(DEFAULT_ALPHA), diff --git a/interface/src/ui/TextOverlay.cpp b/interface/src/ui/TextOverlay.cpp index aec9f641c5..51b57c2f3f 100644 --- a/interface/src/ui/TextOverlay.cpp +++ b/interface/src/ui/TextOverlay.cpp @@ -5,6 +5,8 @@ // Copyright (c) 2014 High Fidelity, Inc. All rights reserved. // +// include this before QGLWidget, which includes an earlier version of OpenGL +#include "InterfaceConfig.h" #include #include