Merge pull request #10 from meshula/master

Make AntTweakbar and glew compile on OSX

Author: janbender

Demos/Visualization/MiniGL.cpp

@@ -7,8 +7,14 @@
 #endif
 
 #include "GL/glew.h"
+#ifdef __APPLE__
+#include <OpenGL/GL.h>
+#include <OpenGL/GLU.h>
+#else
 #include "GL/gl.h"
 #include "GL/glu.h"
+#endif
+
 #include "GL/glut.h"
 #include "GL/freeglut_ext.h"
 

Demos/Visualization/Selection.h

@@ -9,8 +9,14 @@
 #include "windows.h"
 #endif
 
+#ifdef __APPLE__
+#include <OpenGL/GL.h>
+#include <OpenGL/GLU.h>
+#else
 #include "GL/gl.h"
 #include "GL/glu.h"
+#endif
+
 #include <vector>
 
 

extern/AntTweakBar/CMakeLists.txt

@@ -43,7 +43,14 @@ if (WIN32)
     set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -wd4005")
 endif()
 
-if (UNIX)
+if (APPLE)
+   include_directories ( /System/Library/Frameworks )
+   find_library(APPKIT_LIBRARY AppKit)
+   message("Appkit: ${APPKIT_LIBRARY}")
+   set(EXTRA_LIBS ${APPKIT_LIBRARY})
+   set(CMAKE_CXX_FLAGS "-g -Wall -ObjC++ -fPIC -fno-strict-aliasing -D__PLACEMENT_NEW_INLINE")
+   add_definitions(-D_MACOSX)   
+elseif (UNIX)
     add_definitions(-D_UNIX -D__PLACEMENT_NEW_INLINE)
 endif()
 

extern/AntTweakBar/src/LoadOGLCore.h

@@ -146,7 +146,11 @@ 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)
+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 +215,11 @@ 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))
+#ifdef __APPLE__
+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))

extern/glew/CMakeLists.txt

@@ -13,3 +13,15 @@ add_definitions(-DGLEW_NO_GLU -DGLEW_BUILD)
 if (WIN32)
 	target_link_libraries(glew opengl32.lib)                     
 endif()
+
+IF(APPLE)   
+   INCLUDE_DIRECTORIES ( /System/Library/Frameworks )
+   FIND_LIBRARY(COCOA_LIBRARY Cocoa)
+   FIND_LIBRARY(GLUT_LIBRARY GLUT )
+   FIND_LIBRARY(OpenGL_LIBRARY OpenGL )
+   MARK_AS_ADVANCED (COCOA_LIBRARY
+                     GLUT_LIBRARY
+                     OpenGL_LIBRARY)
+   SET(EXTRA_LIBS ${COCOA_LIBRARY} ${GLUT_LIBRARY} ${OpenGL_LIBRARY})
+   target_link_libraries(glew ${EXTRA_LIBS})
+ENDIF (APPLE)