libgui: Added a header for OpenGL (ES) 2

Includes all the needed headers in order to use OpenGL (ES) 2 on the current platform.
skyjake · Apr 16, 2013 · 4a92c1f · 4a92c1f
1 parent 573e336
commit 4a92c1f
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 2 deletions.
diff --git a/doomsday/libgui/include/de/gui/glbuffer.h b/doomsday/libgui/include/de/gui/glbuffer.h
@@ -21,10 +21,10 @@
 
 #include <de/libdeng2.h>
 #include <de/Vector>
-#include <QtOpenGL>
 #include <vector>
 
 #include "libgui.h"
+#include "opengl.h"
 
 namespace de {
 

diff --git a/doomsday/libgui/include/de/gui/opengl.h b/doomsday/libgui/include/de/gui/opengl.h
@@ -0,0 +1,28 @@
+/** @file opengl.h  Headers for OpenGL (ES) 2.
+ *
+ * @authors Copyright (c) 2013 Jaakko Keränen <jaakko.keranen@iki.fi>
+ *
+ * @par License
+ * GPL: http://www.gnu.org/licenses/gpl.html
+ *
+ * <small>This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version. This program is distributed in the hope that it
+ * will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details. You should have received a copy of the GNU
+ * General Public License along with this program; if not, see:
+ * http://www.gnu.org/licenses</small> 
+ */
+
+#ifndef LIBGUI_SYSTEM_OPENGL_H
+#define LIBGUI_SYSTEM_OPENGL_H
+
+#include <QtOpenGL>
+
+#ifdef MACOSX
+#  include <OpenGL/gl.h>
+#endif
+
+#endif // LIBGUI_SYSTEM_OPENGL_H
diff --git a/doomsday/libgui/libgui.pro b/doomsday/libgui/libgui.pro
@@ -78,6 +78,7 @@ HEADERS += \
     include/de/gui/keyeventsource.h \
     include/de/gui/libgui.h \
     include/de/gui/mouseeventsource.h \
+    include/de/gui/opengl.h \
     include/de/gui/persistentcanvaswindow.h
 
 # Sources and private headers.

diff --git a/doomsday/libgui/src/canvas.cpp b/doomsday/libgui/src/canvas.cpp
@@ -19,6 +19,7 @@
 
 #include "de/Canvas"
 #include "de/CanvasWindow"
+#include "de/gui/opengl.h"
 
 #include <de/App>
 #include <de/Log>
@@ -30,7 +31,6 @@
 #include <QShowEvent>
 #include <QResizeEvent>
 #include <QPaintEvent>
-#include <QtOpenGL>
 #include <QImage>
 #include <QCursor>
 #include <QTimer>