fixed problem with GLUT and new versions of MACOS

Author: miccol

CMakeLists.txt

@@ -1,14 +1,20 @@
-cmake_minimum_required(VERSION 2.8.3)
+cmake_minimum_required(VERSION 3.0)
 project(BTpp)
 
 set(CMAKE_BUILD_TYPE Release)
-add_definitions(-Wall -lglut -lGL -lgtest -std=c++11)
+add_definitions(-Wall -lglut -lGL -lgtest -std=c++11 -lX11)
 
 # Needed for using threads
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+
+
 #########################################################
-# FIND GTest
+# FIND X11
 #########################################################
+find_package(X11 REQUIRED)
+include_directories(${X11_INCLUDE_DIR})
+link_directories(${X11_LIBRARIES})
+
 find_package(GTest)
 include_directories(${GTEST_INCLUDE_DIRS})
 if(NOT GTEST_FOUND)
@@ -41,7 +47,14 @@ endif(NOT OPENGL_FOUND)
 INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/include/)
 INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/gtest/include/)
 
-#INCLUDE_DIRECTORIES(/usr/local/include/btpp/)
+if(APPLE)
+   include_directories(AFTER "/opt/X11/include")
+    set(CMAKE_OSX_ARCHITECTURES "x86_64")
+    if(CMAKE_GENERATOR STREQUAL Xcode)
+        set(CMAKE_OSX_DEPLOYMENT_TARGET "10.8")
+    endif()
+endif()
+
 
 file(GLOB_RECURSE BTHeadLibrary include/*.h)
 
@@ -84,13 +97,13 @@ endif(GTEST_FOUND)
 # COMPILING SAMPLE EXAMPLE
 ######################################################
 add_executable(btpp_example src/example.cpp ${BTSrcLibrary} ${BTHeadLibrary})
-target_link_libraries(btpp_example  ${OPENGL_LIBRARIES} ${GLUT_LIBRARY})
+target_link_libraries(btpp_example  ${OPENGL_LIBRARIES} ${GLUT_LIBRARY} ${X11_LIBRARIES})
 
 ######################################################
 # COMPILING LIBRARY
 ######################################################
 add_library(btpp SHARED ${BTSrcLibrary} ${BTHeadLibrary})
-target_link_libraries(btpp ${OPENGL_LIBRARIES} ${GLUT_LIBRARY})
+target_link_libraries(btpp ${OPENGL_LIBRARIES} ${GLUT_LIBRARY} ${X11_LIBRARIES})
 
 ######################################################
 # INSTALLATION OF LIBRARY AND EXECUTABLE TO /usr/local

include/draw.h

@@ -1,8 +1,13 @@
 #ifndef DRAWTREE_H
 #define DRAWTREE_H
 #include <cstdlib>
+
+#ifdef __APPLE__
+#include <GLUT/glut.h>
+#else
 #include <GL/glut.h>
-#include <GL/glut.h>
+#endif
+
 #include <math.h>
 #include<iostream>
 #include<string>

include/exceptions.h

@@ -13,7 +13,6 @@ namespace BT
         const char* Message;
     public:
         BehaviorTreeException(const std::string Message);
-        const char* what();
     };
 }
 

src/behavior_tree.cpp

@@ -19,7 +19,7 @@ void Execute(BT::ControlNode* root, int TickPeriod_milliseconds)
 {
     std::cout << "Start Drawing!" << std::endl;
     // Starts in another thread the drawing of the BT
-    std::thread t(&drawTree, root);
+    //std::thread t(&drawTree, root);
 
     root->ResetColorState();
 

src/draw.cpp

@@ -491,7 +491,7 @@ void drawTree(BT::ControlNode* tree_)
         XInitThreads();
         glutInit(&argc, argv);
         init = true;
-        glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGBA | GLUT_DEPTH | GLUT_MULTISAMPLE);  //  Antialiasing
+        glutInitDisplayMode(GLUT_DEPTH  | GLUT_RGBA | GLUT_DOUBLE | GLUT_MULTISAMPLE );  //  Antialiasing
         glEnable(GL_MULTISAMPLE);
     }
     tree = tree_;

src/exceptions.cpp

@@ -17,8 +17,3 @@ BT::BehaviorTreeException::BehaviorTreeException(const std::string Message)
 {
     this->Message = std::string("BehaviorTreeException: " + Message).c_str();
 }
-
-const char* BT::BehaviorTreeException::what()
-{
-    return Message;
-}