From cf9372e1dce126038194cdbb076fc8aca554d3cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20Pe=C3=B1aranda?= <luisp@impa.br>
Date: Tue, 8 Jan 2013 11:26:38 -0200
Subject: [PATCH] corrected GL includes

---
 openglcanvas.h | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/openglcanvas.h b/openglcanvas.h
index 3d3d25b..835834e 100644
--- a/openglcanvas.h
+++ b/openglcanvas.h
@@ -1,25 +1,12 @@
 #ifndef OPENGLCANVAS_H
 #define OPENGLCANVAS_H
 
-#ifndef GL_VERSION_3_1
-    #include <GL/glew.h>
-    #if (!defined GLEW_VERSION_1_5) || (!defined GL_VERSION_3_1)
-        #error OpenGL 3.1 or GLEW 1.5.2 is required
-    #endif
+// GLew might not be needed if a recent version of OpenGL is present
+#include <GL/glew.h>
+#if (!defined GLEW_VERSION_1_5) || (!defined GL_VERSION_3_1)
+    #error GLEW 1.5.2 is required
 #endif
 
-#include <QGLWidget>
-#include <fcntl.h>
-#include <unistd.h>
-#include "chronos.h"
-#include <QTimer>
-
-extern "C" {
-#include <ppm.h>
-#include <pm.h>
-#include <pam.h>
-}
-
 #define GL_GLEXT_PROTOTYPES 1
 #ifdef __APPLE__
   #include<OpenGL/gl.h>
@@ -33,8 +20,19 @@ extern "C" {
   #include <GL/glext.h>
 #endif
 
+#include <QGLWidget>
+#include <QTimer>
 #include <QFile>
 #include <QFileDialog>
+#include <fcntl.h>
+#include <unistd.h>
+#include "chronos.h"
+
+extern "C" {
+#include <ppm.h>
+#include <pm.h>
+#include <pam.h>
+}
 
 class OpenGLCanvas : public QGLWidget
 {
-- 
GitLab