aboutsummaryrefslogtreecommitdiff
path: root/backends/graphics
diff options
context:
space:
mode:
authorFilippos Karapetis2010-12-01 15:15:42 +0000
committerFilippos Karapetis2010-12-01 15:15:42 +0000
commite5f2c235d307f14081812608345b963f62ccbe5d (patch)
tree0789aad405584bcc8b4bc92ec05ea3e3c0fb6fed /backends/graphics
parentbd5ab7e501f32b2274812a64830f4d00ad6c11cf (diff)
downloadscummvm-rg350-e5f2c235d307f14081812608345b963f62ccbe5d.tar.gz
scummvm-rg350-e5f2c235d307f14081812608345b963f62ccbe5d.tar.bz2
scummvm-rg350-e5f2c235d307f14081812608345b963f62ccbe5d.zip
BACKENDS: Simplify the inclusion of gl.h. SDL has already simplified it for us :)
svn-id: r54704
Diffstat (limited to 'backends/graphics')
-rw-r--r--backends/graphics/opengl/gltexture.h14
1 files changed, 4 insertions, 10 deletions
diff --git a/backends/graphics/opengl/gltexture.h b/backends/graphics/opengl/gltexture.h
index c5a06bbc54..bc806f6064 100644
--- a/backends/graphics/opengl/gltexture.h
+++ b/backends/graphics/opengl/gltexture.h
@@ -34,18 +34,12 @@
#if defined(USE_GLES)
#include <GLES/gl.h>
-#elif defined(MACOSX)
-#include <OpenGL/gl.h>
-#else
-
-#include <GL/gl.h>
-#if defined(SDL_BACKEND) && !defined(GL_VERSION_1_2)
-// The OpenGL libraries included in Windows are for OpenGL 1.1. Use the SDL
-// OpenGL header file to enable the additional needed defines for OpenGL 1.2
-// here.
-#include <SDL_opengl.h>
#endif
+#if defined(SDL_BACKEND)
+#include <SDL_opengl.h>
+#else
+#include <GL/gl.h>
#endif
#include "graphics/surface.h"