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

[thebluegr at users.sourceforge.net]

Revision: 54732
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54732&view=rev
Author:   thebluegr
Date:     2010-12-02 09:09:53 +0000 (Thu, 02 Dec 2010)

Log Message:
-----------
OPENGL: Fixed flawed include file logic in gltexture.h, when USE_GLES is defined (a regression from r54704)

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-02 04:01:07 UTC (rev 54731)
+++ scummvm/trunk/backends/graphics/opengl/gltexture.h	2010-12-02 09:09:53 UTC (rev 54732)
@@ -32,12 +32,10 @@
 #undef ARRAYSIZE
 #endif
 
-#if defined(USE_GLES)
-#include <GLES/gl.h>
-#endif
-
 #if defined(SDL_BACKEND)
 #include <SDL_opengl.h>
+#elif defined(USE_GLES)
+#include <GLES/gl.h>
 #else
 #include <GL/gl.h>
 #endif


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