diff --git a/openglcanvas.h b/openglcanvas.h index 3d3d25bc5149a01d25168c26e3d0ea5e1e640a3c..835834e0b3252a5a0a0cfd2e504dcc7eecfc1445 100644 --- a/openglcanvas.h +++ b/openglcanvas.h @@ -1,25 +1,12 @@ #ifndef OPENGLCANVAS_H #define OPENGLCANVAS_H -#ifndef GL_VERSION_3_1 - #include - #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 +#if (!defined GLEW_VERSION_1_5) || (!defined GL_VERSION_3_1) + #error GLEW 1.5.2 is required #endif -#include -#include -#include -#include "chronos.h" -#include - -extern "C" { -#include -#include -#include -} - #define GL_GLEXT_PROTOTYPES 1 #ifdef __APPLE__ #include @@ -33,8 +20,19 @@ extern "C" { #include #endif +#include +#include #include #include +#include +#include +#include "chronos.h" + +extern "C" { +#include +#include +#include +} class OpenGLCanvas : public QGLWidget {