From f31c31a51a334545911775da53aa6b5afac54c42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20Pe=C3=B1aranda?= <luisp@impa.br>
Date: Wed, 15 May 2013 16:25:50 -0300
Subject: [PATCH] moved includes related to GL to a separate header

---
 glincludes.h   | 26 ++++++++++++++++++++++++++
 openglcanvas.h | 23 +----------------------
 2 files changed, 27 insertions(+), 22 deletions(-)
 create mode 100644 glincludes.h

diff --git a/glincludes.h b/glincludes.h
new file mode 100644
index 0000000..b93fae1
--- /dev/null
+++ b/glincludes.h
@@ -0,0 +1,26 @@
+#ifndef GLINCLUDES_H
+#define GLINCLUDES_H
+
+// GLew might not be needed on mac, or if a recent version of OpenGL is present
+#ifndef __APPLE__
+  #include <GL/glew.h>
+  #if (!defined GLEW_VERSION_1_5) || (!defined GL_VERSION_3_1)
+    #error GLEW 1.5.2 is required
+  #endif
+#endif
+
+#define GL_GLEXT_PROTOTYPES 1
+#ifdef __APPLE__
+  #include<OpenGL/gl.h>
+  #include<OpenGL/glu.h>
+  #include<Glut/glut.h>
+  #include<OpenGL/glext.h>
+#else
+  //#include <GL/gl.h>
+  //#include <GL/glu.h>
+  #include <GL/glut.h>
+  // is glext really needed?
+  //#include <GL/glext.h>
+#endif
+
+#endif // GLINCLUDES_H
diff --git a/openglcanvas.h b/openglcanvas.h
index 42bf364..ee084a8 100644
--- a/openglcanvas.h
+++ b/openglcanvas.h
@@ -1,28 +1,7 @@
 #ifndef OPENGLCANVAS_H
 #define OPENGLCANVAS_H
 
-// GLew might not be needed on mac, or if a recent version of OpenGL is present
-#ifndef __APPLE__
-  #include <GL/glew.h>
-  #if (!defined GLEW_VERSION_1_5) || (!defined GL_VERSION_3_1)
-    #error GLEW 1.5.2 is required
-  #endif
-#endif
-
-#define GL_GLEXT_PROTOTYPES 1
-#ifdef __APPLE__
-  #include<OpenGL/gl.h>
-  #include<OpenGL/glu.h>
-  #include<Glut/glut.h>
-  #include<OpenGL/glext.h>
-#else
-  //#include <GL/gl.h>
-  //#include <GL/glu.h>
-  #include <GL/glut.h>
-  // is glext really needed?
-  //#include <GL/glext.h>
-#endif
-
+#include "glincludes.h"
 #include <QGLWidget>
 #include <QTimer>
 #include <QFile>
-- 
GitLab