diff --git a/glincludes.h b/glincludes.h new file mode 100644 index 0000000000000000000000000000000000000000..b93fae1b9ab1d4e8af44aa7beb1b795a135b2c09 --- /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 + #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 + #include + #include + #include +#else + //#include + //#include + #include + // is glext really needed? + //#include +#endif + +#endif // GLINCLUDES_H diff --git a/openglcanvas.h b/openglcanvas.h index 42bf36454dec141adcdb9eb0b03919241678c2b8..ee084a82ed906ce1097749fc345ced7e46fe65eb 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 - #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 - #include - #include - #include -#else - //#include - //#include - #include - // is glext really needed? - //#include -#endif - +#include "glincludes.h" #include #include #include