Fix includes and update deheader ci script.

7 files changed, 17 insertions, 8 deletions

diff --git a/src/render/opengl/mgl.cpp b/src/render/opengl/mgl.cpp
index d65ac3ec6..cdcd5808b 100644
--- a/src/render/opengl/mgl.cpp
+++ b/src/render/opengl/mgl.cpp
@@ -18,10 +18,10 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "render/opengl/mgl.h"
-
 #ifdef USE_OPENGL
 
+#include "render/opengl/mgl.h"
+
 #include "debug.h"
 
 #define defName(name) name##_t m##name = nullptr
@@ -29,4 +29,6 @@
 // include function defines
 #include "render/opengl/mgl.hpp"
 
+MGL_DEFINE
+
 #endif
diff --git a/src/render/opengl/mgl.h b/src/render/opengl/mgl.h
index 07c5b7cf7..9c67687c8 100644
--- a/src/render/opengl/mgl.h
+++ b/src/render/opengl/mgl.h
@@ -21,8 +21,6 @@
 #ifndef RENDER_OPENGL_MGL_H
 #define RENDER_OPENGL_MGL_H
 
-#include "main.h"
-
 #ifdef USE_OPENGL
 
 #include "render/opengl/mgltypes.h"
@@ -32,7 +30,10 @@
 
 #include "render/opengl/mgl.hpp"
 
+MGL_DEFINE
+
 #undef defName
+#undef MGL_DEFINE
 
 #endif  // USE_OPENGL
 #endif  // RENDER_OPENGL_MGL_H
diff --git a/src/render/opengl/mgl.hpp b/src/render/opengl/mgl.hpp
index 7bc2fa5e8..b6b6a8508 100644
--- a/src/render/opengl/mgl.hpp
+++ b/src/render/opengl/mgl.hpp
@@ -18,6 +18,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#define MGL_DEFINE
+
 defName(glGenRenderbuffers);
 defName(glBindRenderbuffer);
 defName(glRenderbufferStorage);
diff --git a/src/render/opengl/mglcheck.h b/src/render/opengl/mglcheck.h
index b98eed846..478ea25ba 100644
--- a/src/render/opengl/mglcheck.h
+++ b/src/render/opengl/mglcheck.h
@@ -21,7 +21,6 @@
 #ifndef RENDER_OPENGL_MGLCHECK_H
 #define RENDER_OPENGL_MGLCHECK_H
 
-#include "main.h"
 #ifdef USE_OPENGL
 
 #define isGLNull(func) (!(func))
diff --git a/src/render/opengl/mglfunctions.h b/src/render/opengl/mglfunctions.h
index db0f3bc95..de445c06b 100644
--- a/src/render/opengl/mglfunctions.h
+++ b/src/render/opengl/mglfunctions.h
@@ -25,6 +25,8 @@
 
 #include "logger.h"
 
+LOGGER_H
+
 #ifdef WIN32
 #define getFunction(name) wglGetProcAddress(name)
 #elif defined ANDROID
diff --git a/src/render/opengl/mgltypes.h b/src/render/opengl/mgltypes.h
index 2d02979d4..2e85a5719 100644
--- a/src/render/opengl/mgltypes.h
+++ b/src/render/opengl/mgltypes.h
@@ -21,11 +21,8 @@
 #ifndef RENDER_OPENGL_MGLTYPES_H
 #define RENDER_OPENGL_MGLTYPES_H
 
-#include "main.h"
-
 #ifdef USE_OPENGL
 
-
 #ifdef ANDROID
 #include <GLES/gl.h>
 #include <GLES/glext.h>
@@ -42,11 +39,15 @@
 #include <OpenGL/glext.h>
 #else  // defined(__APPLE__)
 #include <GL/glext.h>
+#ifndef __glext_h_
+#error missing include <GL/glext.h>
+#endif //  __glext_h_
 #endif  // defined(__APPLE__)
 #endif
 #endif
 
 #include "render/opengl/mgldefines.h"
+RENDER_OPENGL_MGLDEFINES_H
 
 #if defined(__GXX_EXPERIMENTAL_CXX0X__)
 #include <cstdint>
diff --git a/src/render/opengl/opengldebug.h b/src/render/opengl/opengldebug.h
index 6ff7da0a8..8d2f19e18 100644
--- a/src/render/opengl/opengldebug.h
+++ b/src/render/opengl/opengldebug.h
@@ -23,6 +23,8 @@
 
 #include "render/opengl/mgl.h"
 
+RENDER_OPENGL_MGL_H
+
 #if defined(DEBUG_OPENGL) && defined(USE_OPENGL)
 #define GLDEBUG_START(text) if (mglPushGroupMarker) \
     mglPushGroupMarker(sizeof(text), text);