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

[thebluegr at users.sourceforge.net]

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

Log Message:
-----------
BACKENDS: Use SDL_opengl.h instead of the nonstandard glext.h to ensure OpenGL 1.2 compatibility in Windows systems

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:46:59 UTC (rev 54699)
+++ scummvm/trunk/backends/graphics/opengl/gltexture.h	2010-12-01 14:54:13 UTC (rev 54700)
@@ -36,13 +36,18 @@
 #include <GLES/gl.h>
 #elif defined(MACOSX)
 #include <OpenGL/gl.h>
-#elif defined(WIN32)
-#include <GL/gl.h>
-#include <GL/glext.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
 
+#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.