From 1fe641c6a8e5a9186645e7b776a31337064f77d8 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 15 Jul 2016 19:39:12 +0300 Subject: Fix different include issues. --- src/render/mobileopengl2graphics.h | 10 +++++----- src/render/sdlgraphics.h | 4 ---- 2 files changed, 5 insertions(+), 9 deletions(-) (limited to 'src/render') diff --git a/src/render/mobileopengl2graphics.h b/src/render/mobileopengl2graphics.h index d63e6a2e1..b351440fd 100644 --- a/src/render/mobileopengl2graphics.h +++ b/src/render/mobileopengl2graphics.h @@ -23,7 +23,7 @@ #ifndef RENDER_MOBILEOPENGL2GRAPHICS_H #define RENDER_MOBILEOPENGL2GRAPHICS_H -#if defined USE_OPENGL && !defined ANDROID +#if defined(USE_OPENGL) && !defined(ANDROID) #include "localconsts.h" @@ -35,17 +35,17 @@ #include #include #include -#else +#else // ANDROID #ifndef USE_SDL2 #define GL_GLEXT_PROTOTYPES 1 -#endif +#endif // USE_SDL2 #include #if defined(__APPLE__) #include #elif !defined(__native_client__) #include #endif // defined(__APPLE__) -#endif +#endif // ANDROID class OpenGLGraphicsVertexes; class ShaderProgram; @@ -154,6 +154,6 @@ class MobileOpenGL2Graphics final : public Graphics #endif FBOInfo mFbo; }; -#endif +#endif // defined(USE_OPENGL) && !defined(ANDROID) #endif // RENDER_MOBILEOPENGL2GRAPHICS_H diff --git a/src/render/sdlgraphics.h b/src/render/sdlgraphics.h index 0f18c3c03..bb9e7bd60 100644 --- a/src/render/sdlgraphics.h +++ b/src/render/sdlgraphics.h @@ -33,10 +33,6 @@ RENDER_SDL2GRAPHICS_H #include "localconsts.h" -class Image; -class ImageCollection; -class ImageVertexes; - /** * A central point of control for graphics. */ -- cgit v1.2.3-60-g2f50