Fixed OpenGL ES 2.0 and 3.0 build.

src/Magnum/AbstractFramebuffer.cpp

@@ -24,7 +24,9 @@
 
 #include "AbstractFramebuffer.h"
 
+#ifndef MAGNUM_TARGET_GLES2
 #include "Magnum/BufferImage.h"
+#endif
 #include "Magnum/Context.h"
 #include "Magnum/Extensions.h"
 #include "Magnum/Image.h"

src/Magnum/AbstractTexture.cpp

@@ -24,7 +24,9 @@
 
 #include "AbstractTexture.h"
 
+#ifndef MAGNUM_TARGET_GLES2
 #include "Magnum/BufferImage.h"
+#endif
 #include "Magnum/ColorFormat.h"
 #include "Magnum/Context.h"
 #include "Magnum/Extensions.h"

src/Magnum/Context.cpp

@@ -33,7 +33,9 @@
 #include "Magnum/AbstractShaderProgram.h"
 #include "Magnum/AbstractTexture.h"
 #include "Magnum/Buffer.h"
+#ifndef MAGNUM_TARGET_GLES
 #include "Magnum/BufferTexture.h"
+#endif
 #include "Magnum/DefaultFramebuffer.h"
 #include "Magnum/Extensions.h"
 #include "Magnum/Framebuffer.h"

src/Magnum/Framebuffer.cpp

@@ -24,7 +24,11 @@
 
 #include "Framebuffer.h"
 
+#include <Corrade/Containers/Array.h>
+
+#ifndef MAGNUM_TARGET_GLES2
 #include "Magnum/BufferImage.h"
+#endif
 #include "Magnum/Context.h"
 #include "Magnum/Extensions.h"
 #include "Magnum/Image.h"

src/Magnum/Platform/magnum-info.cpp

@@ -31,7 +31,9 @@
 
 #include "Magnum/AbstractShaderProgram.h"
 #include "Magnum/Buffer.h"
+#ifndef MAGNUM_TARGET_GLES
 #include "Magnum/BufferTexture.h"
+#endif
 #include "Magnum/Context.h"
 #include "Magnum/DebugMessage.h"
 #include "Magnum/Extensions.h"

src/Magnum/Test/CubeMapTextureGLTest.cpp

@@ -24,7 +24,10 @@
 
 #include <Corrade/TestSuite/Compare/Container.h>
 
+#include "Magnum/configure.h"
+#ifndef MAGNUM_TARGET_GLES2
 #include "Magnum/BufferImage.h"
+#endif
 #include "Magnum/ColorFormat.h"
 #include "Magnum/Image.h"
 #include "Magnum/CubeMapTexture.h"

src/Magnum/Test/FramebufferGLTest.cpp

@@ -22,7 +22,10 @@
     DEALINGS IN THE SOFTWARE.
 */
 
+#include "Magnum/configure.h"
+#ifndef MAGNUM_TARGET_GLES2
 #include "Magnum/BufferImage.h"
+#endif
 #include "Magnum/ColorFormat.h"
 #include "Magnum/Context.h"
 #include "Magnum/Extensions.h"

src/Magnum/Test/TextureGLTest.cpp

@@ -24,7 +24,10 @@
 
 #include <Corrade/TestSuite/Compare/Container.h>
 
+#include "Magnum/configure.h"
+#ifndef MAGNUM_TARGET_GLES2
 #include "Magnum/BufferImage.h"
+#endif
 #include "Magnum/ColorFormat.h"
 #include "Magnum/Image.h"
 #include "Magnum/Texture.h"

src/MagnumPlugins/TgaImporter/TgaImporter.cpp

@@ -35,10 +35,13 @@
 
 #ifdef MAGNUM_TARGET_GLES
 #include <algorithm>
-#include "Math/Swizzle.h"
+#include "Magnum/Math/Swizzle.h"
-#include "Math/Vector4.h"
+#include "Magnum/Math/Vector4.h"
-#include "Context.h"
+#endif
-#include "Extensions.h"
+
+#ifdef MAGNUM_TARGET_GLES2
+#include "Magnum/Context.h"
+#include "Magnum/Extensions.h"
 #endif
 
 namespace Magnum { namespace Trade {