Commit f31c31a5 authored by Luis Penaranda's avatar Luis Penaranda
Browse files

moved includes related to GL to a separate header

parent 849dfe2d

glincludes.h

0 → 100644
+26 −0
Original line number Diff line number Diff line 
#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

openglcanvas.h

+1 −22
Original line number Diff line number Diff line 
#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>