aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2010-11-28 18:57:36 +0000
committerMax Horn2010-11-28 18:57:36 +0000
commitce119b95401955d0ad00eaf0e9169237dfba1016 (patch)
tree04333ea1689242b77cbb64730fbb7164750d2e1f
parent364382cf9fcc013d7acb6c8252bf62e805ccd01c (diff)
downloadscummvm-rg350-ce119b95401955d0ad00eaf0e9169237dfba1016.tar.gz
scummvm-rg350-ce119b95401955d0ad00eaf0e9169237dfba1016.tar.bz2
scummvm-rg350-ce119b95401955d0ad00eaf0e9169237dfba1016.zip
OPENGL: Fix OpenGL on Mac OS X
svn-id: r54545
-rw-r--r--backends/graphics/opengl/glerrorcheck.cpp2
-rw-r--r--backends/graphics/opengl/gltexture.h4
-rwxr-xr-xconfigure1
3 files changed, 3 insertions, 4 deletions
diff --git a/backends/graphics/opengl/glerrorcheck.cpp b/backends/graphics/opengl/glerrorcheck.cpp
index 8d5dcf49da..c3b0c9cd63 100644
--- a/backends/graphics/opengl/glerrorcheck.cpp
+++ b/backends/graphics/opengl/glerrorcheck.cpp
@@ -38,7 +38,7 @@
#endif
#ifdef MACOSX
-#include <gl.h>
+#include <OpenGL/gl.h>
#elif defined(USE_GLES)
#include <GLES/gl.h>
#else
diff --git a/backends/graphics/opengl/gltexture.h b/backends/graphics/opengl/gltexture.h
index 9864f6816c..40060e2158 100644
--- a/backends/graphics/opengl/gltexture.h
+++ b/backends/graphics/opengl/gltexture.h
@@ -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>
diff --git a/configure b/configure
index 38252b703e..ae392943c6 100755
--- a/configure
+++ b/configure
@@ -2670,7 +2670,6 @@ if test "$_opengl" = yes ; then
DEFINES="$DEFINES -DUSE_OPENGL"
case $_host_os in
*darwin*)
- INCLUDES="$INCLUDES -I/System/Library/Frameworks/OpenGL.framework/Headers"
LIBS="$LIBS -framework OpenGL"
;;
*mingw*)