- added support for Mac OS X

Author: janbender

CMake/Common.cmake

@@ -23,4 +23,8 @@ if (UNIX)
     set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG -fopenmp") 
 endif (UNIX)
 
+if(APPLE)
+	set(CMAKE_MACOSX_RPATH 1)
+endif()
+
 add_definitions(-D_CRT_SECURE_NO_DEPRECATE)

Changelog.txt

@@ -1,3 +1,4 @@
+	- added support for Mac OS X
 	- added shader support
 	- added automatic computation of inertia tensor for arbitrary triangle meshes
 	- added bunny model to chain demo

Demos/Visualization/MiniGL.cpp

@@ -7,6 +7,7 @@
 #endif
 
 #include "GL/glew.h"
+
 #ifdef __APPLE__
 #include <OpenGL/GL.h>
 #include <OpenGL/GLU.h>
@@ -461,7 +462,9 @@ void MiniGL::init (int argc, char **argv, int width, int height, int posx, int p
 	glutSpecialFunc (special);
 	glutDisplayFunc (display);
 	glutIdleFunc (idlefunc);
+#ifndef __APPLE__
 	glutMouseWheelFunc(mouseWheel);
+#endif
 
 	// after GLUT initialization
 	// directly redirect GLUT events to AntTweakBar
@@ -472,7 +475,9 @@ void MiniGL::init (int argc, char **argv, int width, int height, int posx, int p
 
 	glPolygonMode (GL_FRONT_AND_BACK, GL_FILL);
 
+#ifndef __APPLE__
 	glutSetOption(GLUT_ACTION_ON_WINDOW_CLOSE, GLUT_ACTION_GLUTMAINLOOP_RETURNS);
+#endif
 }
 
 void MiniGL::initTexture()
@@ -642,7 +647,11 @@ void MiniGL::keyboard (unsigned char k, int x, int y)
 
 	if (k == 27)
 	{
+#ifndef __APPLE__
 		glutLeaveMainLoop();
+#else
+		exit(0);
+#endif
 		return;
 	}
 	else if (k == 97)

README.md

@@ -4,7 +4,7 @@ This library supports the physically-based simulation of mechanical effects. In
 
 The PositionBasedDynamics library allows the position-based handling of many types of constraints in a physically-based simulation. The library uses [CMake](http://www.cmake.org/), [Eigen](http://eigen.tuxfamily.org/) and [AntTweakBar](http://anttweakbar.sourceforge.net/) (only for the demos). All external dependencies are included. 
 
-The library was tested on Windows 7 and OpenSuse Linux 13.2. However, it should also be possible to use it on Mac OS X systems. 
+The library was tested on Windows 7, OpenSuse Linux 13.2, Mac OS X 10.10.5. However, it should also be possible to use it on Mac OS X systems. 
 
 **Author**: [Jan Bender](http://www.interactive-graphics.de), **License**: MIT
 
@@ -16,6 +16,7 @@ http://www.interactive-graphics.de/PositionBasedDynamics/doc/html
 
 ## Latest Important Changes
 
+* added support for Mac OS X
 * added automatic computation of inertia tensor for arbitrary triangle meshes
 * added OBJ file loader
 * added target velocity motor slider joint

extern/AntTweakBar/CMakeLists.txt

@@ -46,7 +46,6 @@ endif()
 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)   
@@ -60,8 +59,10 @@ add_library(AntTweakBar STATIC ${ATB_HEADERS} ${ATB_SOURCES})
 
 set_target_properties(AntTweakBar PROPERTIES FOLDER "External Dependencies")
 
-if (UNIX)
-	target_link_libraries(AntTweakBar X11)
+if (APPLE)
+    target_link_libraries(AntTweakBar) 
+elseif (UNIX)
+    target_link_libraries(AntTweakBar X11)
 endif()
 
 set(AntTweakBar_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include

extern/glew/CMakeLists.txt

@@ -14,14 +14,14 @@ 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
+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})
+   set(EXTRA_LIBS ${COCOA_LIBRARY} ${GLUT_LIBRARY} ${OpenGL_LIBRARY})
    target_link_libraries(glew ${EXTRA_LIBS})
-ENDIF (APPLE)
+endif (APPLE)