[Scummvm-cvs-logs] SF.net SVN: scummvm:[54704] scummvm/trunk/backends/graphics/opengl/ gltexture.h

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Wed Dec 1 16:15:43 CET 2010


Revision: 54704
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54704&view=rev
Author:   thebluegr
Date:     2010-12-01 15:15:42 +0000 (Wed, 01 Dec 2010)

Log Message:
-----------
BACKENDS: Simplify the inclusion of gl.h. SDL has already simplified it for us :)

Modified Paths:
--------------
    scummvm/trunk/backends/graphics/opengl/gltexture.h

Modified: scummvm/trunk/backends/graphics/opengl/gltexture.h
===================================================================
--- scummvm/trunk/backends/graphics/opengl/gltexture.h	2010-12-01 14:57:22 UTC (rev 54703)
+++ scummvm/trunk/backends/graphics/opengl/gltexture.h	2010-12-01 15:15:42 UTC (rev 54704)
@@ -34,20 +34,14 @@
 
 #if defined(USE_GLES)
 #include <GLES/gl.h>
-#elif defined(MACOSX)
-#include <OpenGL/gl.h>
-#else
+#endif
 
-#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.
+#if defined(SDL_BACKEND)
 #include <SDL_opengl.h>
+#else
+#include <GL/gl.h>
 #endif
 
-#endif
-
 #include "graphics/surface.h"
 
 #include "common/rect.h"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list