From 0a9f9a7c7a77ad151aca953ccc380281105cbede Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Sat, 15 Feb 2014 19:20:08 -0800 Subject: [PATCH] fix windows build --- interface/src/ui/ImageOverlay.h | 5 +++-- interface/src/ui/Overlays.h | 14 -------------- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/interface/src/ui/ImageOverlay.h b/interface/src/ui/ImageOverlay.h index cad38b1071..de2dcb7693 100644 --- a/interface/src/ui/ImageOverlay.h +++ b/interface/src/ui/ImageOverlay.h @@ -8,6 +8,9 @@ #ifndef __interface__ImageOverlay__ #define __interface__ImageOverlay__ +// include this before QGLWidget, which includes an earlier version of OpenGL +#include "InterfaceConfig.h" + #include #include #include @@ -19,8 +22,6 @@ #include -#include "InterfaceConfig.h" - const xColor DEFAULT_BACKGROUND_COLOR = { 255, 255, 255 }; const float DEFAULT_ALPHA = 0.7f; diff --git a/interface/src/ui/Overlays.h b/interface/src/ui/Overlays.h index ed686dc024..84e4338a72 100644 --- a/interface/src/ui/Overlays.h +++ b/interface/src/ui/Overlays.h @@ -8,20 +8,6 @@ #ifndef __interface__Overlays__ #define __interface__Overlays__ -/** -#include -#include -#include -#include -#include -#include -#include - -#include - -#include "InterfaceConfig.h" -**/ - #include #include "ImageOverlay.h"