Fixed OpenGL compilation for new iOS (and removed ugly hack for Mac OS X 10.8)

3 files changed, 9 insertions, 2 deletions

diff --git a/graphics/opengl/opengl.cpp b/graphics/opengl/opengl.cpp
index 3cfe6b9414..5c5c24e043 100644
--- a/graphics/opengl/opengl.cpp
+++ b/graphics/opengl/opengl.cpp
@@ -84,7 +84,11 @@ namespace graphics
     void (OPENGL_CALLING_CONVENTION * glGetShaderInfoLogFn)(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
     void (OPENGL_CALLING_CONVENTION * glGetShaderivFn)(GLuint shader, GLenum pname, GLint *params);
     void (OPENGL_CALLING_CONVENTION * glCompileShaderFn)(GLuint shader);
+#if (__IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_7_0) || (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_8)
+    void (OPENGL_CALLING_CONVENTION * glShaderSourceFn)(GLuint shader, GLsizei count, const GLchar* const *string, const GLint *length);
+#else
     void (OPENGL_CALLING_CONVENTION * glShaderSourceFn)(GLuint shader, GLsizei count, const GLchar* *string, const GLint *length);
+#endif
     GLuint (OPENGL_CALLING_CONVENTION * glCreateShaderFn)(GLenum type);
     void (OPENGL_CALLING_CONVENTION * glDeleteShaderFn)(GLuint shader);
 
diff --git a/graphics/opengl/opengl.hpp b/graphics/opengl/opengl.hpp
index 0af36d61d6..9cc6598295 100644
--- a/graphics/opengl/opengl.hpp
+++ b/graphics/opengl/opengl.hpp
@@ -176,7 +176,11 @@ namespace graphics
     extern void (OPENGL_CALLING_CONVENTION * glGetShaderInfoLogFn)(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
     extern void (OPENGL_CALLING_CONVENTION * glGetShaderivFn)(GLuint shader, GLenum pname, GLint *params);
     extern void (OPENGL_CALLING_CONVENTION * glCompileShaderFn)(GLuint shader);
+#if (__IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_7_0) || (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_8)
+    extern void (OPENGL_CALLING_CONVENTION * glShaderSourceFn)(GLuint shader, GLsizei count, const GLchar* const *string, const GLint *length);
+#else
     extern void (OPENGL_CALLING_CONVENTION * glShaderSourceFn)(GLuint shader, GLsizei count, const GLchar* *string, const GLint *length);
+#endif
     extern GLuint (OPENGL_CALLING_CONVENTION * glCreateShaderFn)(GLenum type);
     extern void (OPENGL_CALLING_CONVENTION * glDeleteShaderFn)(GLuint shader);
 
diff --git a/graphics/opengl/opengl_ext.cpp b/graphics/opengl/opengl_ext.cpp
index 9a24ffb0b7..19444c2aea 100644
--- a/graphics/opengl/opengl_ext.cpp
+++ b/graphics/opengl/opengl_ext.cpp
@@ -92,8 +92,7 @@ namespace graphics
       glGetShaderInfoLogFn = &glGetShaderInfoLog;
       glGetShaderivFn = &glGetShaderiv;
       glCompileShaderFn = &glCompileShader;
-      typedef void (OPENGL_CALLING_CONVENTION * glShaderSourceFn_t)(GLuint shader, GLsizei count, const GLchar ** string, const GLint *length);
-      glShaderSourceFn = reinterpret_cast<glShaderSourceFn_t>(&glShaderSource);
+      glShaderSourceFn = &glShaderSource;
       glCreateShaderFn = &glCreateShader;
       glDeleteShaderFn = &glDeleteShader;
     }