Skip to content

Commit

Permalink
anttweakbar: fix compilation on 10.8
Browse files Browse the repository at this point in the history
  • Loading branch information
adamv committed Sep 24, 2013
1 parent bf1234f commit 7b03bba
Showing 1 changed file with 40 additions and 0 deletions.
40 changes: 40 additions & 0 deletions Library/Formula/anttweakbar.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ class Anttweakbar < Formula
version '1.16'
sha1 '5743321df3b074f9a82b5ef3e6b54830a715b938'

# See
# http://sourceforge.net/p/anttweakbar/code/ci/5a076d13f143175a6bda3c668e29a33406479339/tree/src/LoadOGLCore.h?diff=5528b167ed12395a60949d7c643262b6668f15d5&diformat=regular
def patches
DATA
end

def install
cd 'src' do
system 'make -f Makefile.osx'
Expand All @@ -14,3 +20,37 @@ def install
include.install 'include/AntTweakBar.h'
end
end

__END__
diff --git a/src/LoadOGLCore.h b/src/LoadOGLCore.h
index 8aaab1e..b606d2b 100644
--- a/src/LoadOGLCore.h
+++ b/src/LoadOGLCore.h
@@ -146,7 +146,13 @@ ANT_GL_CORE_DECL(void, glGetCompressedTexImage, (GLenum target, GLint level, GLv
// GL 1.4
ANT_GL_CORE_DECL(void, glBlendFuncSeparate, (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha))
ANT_GL_CORE_DECL(void, glMultiDrawArrays, (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount))
+#if defined(ANT_OSX) && (MAC_OS_X_VERSION_MAX_ALLOWED >= 1080)
+// Mac OSX 10.8 SDK from March 2013 redefines this OpenGL call: glMultiDrawElements
+// if it doesn't compile, please update XCode.
+ANT_GL_CORE_DECL(void, glMultiDrawElements, (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* const*indices, GLsizei primcount))
+#else
ANT_GL_CORE_DECL(void, glMultiDrawElements, (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount))
+#endif
ANT_GL_CORE_DECL(void, glPointParameterf, (GLenum pname, GLfloat param))
ANT_GL_CORE_DECL(void, glPointParameterfv, (GLenum pname, const GLfloat *params))
ANT_GL_CORE_DECL(void, glPointParameteri, (GLenum pname, GLint param))
@@ -211,7 +217,13 @@ ANT_GL_CORE_DECL(void, glGetVertexAttribPointerv, (GLuint index, GLenum pname, G
ANT_GL_CORE_DECL(GLboolean, glIsProgram, (GLuint program))
ANT_GL_CORE_DECL(GLboolean, glIsShader, (GLuint shader))
ANT_GL_CORE_DECL(void, glLinkProgram, (GLuint program))
+#if defined(ANT_OSX) && (MAC_OS_X_VERSION_MAX_ALLOWED >= 1080)
+// Mac OSX 10.8 SDK from March 2013 redefines this OpenGL call: glShaderSource
+// if it doesn't compile, please update XCode.
+ANT_GL_CORE_DECL(void, glShaderSource, (GLuint shader, GLsizei count, const GLchar* const*string, const GLint *length))
+#else
ANT_GL_CORE_DECL(void, glShaderSource, (GLuint shader, GLsizei count, const GLchar* *string, const GLint *length))
+#endif
ANT_GL_CORE_DECL(void, glUseProgram, (GLuint program))
ANT_GL_CORE_DECL(void, glUniform1f, (GLint location, GLfloat v0))
ANT_GL_CORE_DECL(void, glUniform2f, (GLint location, GLfloat v0, GLfloat v1))

0 comments on commit 7b03bba

Please sign in to comment.