[Supertux-Commit] r5772 - trunk/supertux/src/video

[wansti at millhouse.dreamhost.com]

Author: wansti
Date: 2008-09-17 09:41:46 -0700 (Wed, 17 Sep 2008)
New Revision: 5772

Modified:
   trunk/supertux/src/video/glutil.hpp
   trunk/supertux/src/video/texture_manager.cpp
Log:
switched to the flag used in other places


Modified: trunk/supertux/src/video/glutil.hpp
===================================================================
--- trunk/supertux/src/video/glutil.hpp	2008-09-16 16:13:52 UTC (rev 5771)
+++ trunk/supertux/src/video/glutil.hpp	2008-09-17 16:41:46 UTC (rev 5772)
@@ -30,7 +30,7 @@
 #include <OpenGL/gl.h>
 #include <OpenGL/glext.h>
 #else
-#ifdef GP2X
+#ifdef GL_VERSION_ES_CM_1_0
 #include <GLES/gl.h>
 #include <GLES/glext.h>
 #else

Modified: trunk/supertux/src/video/texture_manager.cpp
===================================================================
--- trunk/supertux/src/video/texture_manager.cpp	2008-09-16 16:13:52 UTC (rev 5771)
+++ trunk/supertux/src/video/texture_manager.cpp	2008-09-17 16:41:46 UTC (rev 5772)
@@ -191,7 +191,7 @@
   glBindTexture(GL_TEXTURE_2D, texture->get_handle());
 
   //this doesn't work with OpenGL ES (but we don't need it on the GP2X anyway)
-#ifndef GP2X
+#ifndef GL_VERSION_ES_CM_1_0
   glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_WIDTH,
                            &saved_texture.width);
   glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_HEIGHT,