[Scummvm-cvs-logs] SF.net SVN: scummvm:[54545] scummvm/trunk

[fingolfin at users.sourceforge.net]

Revision: 54545
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54545&view=rev
Author:   fingolfin
Date:     2010-11-28 18:57:36 +0000 (Sun, 28 Nov 2010)

Log Message:
-----------
OPENGL: Fix OpenGL on Mac OS X

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

Modified: scummvm/trunk/backends/graphics/opengl/glerrorcheck.cpp
===================================================================
--- scummvm/trunk/backends/graphics/opengl/glerrorcheck.cpp	2010-11-28 18:39:04 UTC (rev 54544)
+++ scummvm/trunk/backends/graphics/opengl/glerrorcheck.cpp	2010-11-28 18:57:36 UTC (rev 54545)
@@ -38,7 +38,7 @@
 #endif
 
 #ifdef MACOSX
-#include <gl.h>
+#include <OpenGL/gl.h>
 #elif defined(USE_GLES)
 #include <GLES/gl.h>
 #else

Modified: scummvm/trunk/backends/graphics/opengl/gltexture.h
===================================================================
--- scummvm/trunk/backends/graphics/opengl/gltexture.h	2010-11-28 18:39:04 UTC (rev 54544)
+++ scummvm/trunk/backends/graphics/opengl/gltexture.h	2010-11-28 18:57:36 UTC (rev 54545)
@@ -36,8 +36,8 @@
 #include <GLES/gl.h>
 #include <GLES/glext.h>
 #elif defined(MACOSX)
-#include <gl.h>
-#include <glext.h>
+#include <OpenGL/gl.h>
+#include <OpenGL/glext.h>
 #else
 #include <GL/gl.h>
 #include <GL/glext.h>

Modified: scummvm/trunk/configure
===================================================================
--- scummvm/trunk/configure	2010-11-28 18:39:04 UTC (rev 54544)
+++ scummvm/trunk/configure	2010-11-28 18:57:36 UTC (rev 54545)
@@ -2670,7 +2670,6 @@
 	DEFINES="$DEFINES -DUSE_OPENGL"
 	case $_host_os in
 		*darwin*)
-			INCLUDES="$INCLUDES -I/System/Library/Frameworks/OpenGL.framework/Headers"
 			LIBS="$LIBS -framework OpenGL"
 			;;
 		*mingw*)


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