add CMake support for pybullet (still preliminary)

requires shared library build:
cmake .. -DBUILD_SHARED_LIBS=on
then create a symbolic link from libpybullet.so to pybullet.so

examples/CMakeLists.txt

@@ -1,5 +1,5 @@
 SUBDIRS( HelloWorld BasicDemo )
 IF(BUILD_BULLET3)
-	SUBDIRS( ExampleBrowser ThirdPartyLibs/Gwen OpenGLWindow)
+	SUBDIRS( ExampleBrowser ThirdPartyLibs/Gwen OpenGLWindow pybullet)
 ENDIF()
 

examples/ExampleBrowser/CMakeLists.txt

@@ -1,21 +1,19 @@
 
-
 INCLUDE_DIRECTORIES(
 	.
 	${BULLET_PHYSICS_SOURCE_DIR}/src
 	${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs
 )
 
-FILE(GLOB ExampleBrowser_SRCS "*" "GwenGUISupport/*" )
+FILE(GLOB GwenGUISupport_SRCS  "GwenGUISupport/*" )
-FILE(GLOB ExampleBrowser_HDRS "*" "GwenGUISupport/*" )
+FILE(GLOB GwenGUISupport_HDRS  "GwenGUISupport/*" )
 
 
-
+SET(BulletExampleBrowser_SRCS
-SET(App_ExampleBrowser_SRCS
+	OpenGLExampleBrowser.cpp
-	main.cpp
+	OpenGLGuiHelper.cpp
-	ExampleEntries.cpp
-	ExampleEntries.h
 	InProcessExampleBrowser.cpp
+	GL_ShapeDrawer.cpp
 	../SharedMemory/PhysicsServer.cpp
 	../SharedMemory/PhysicsClientSharedMemory.cpp
 	../SharedMemory/PhysicsClient.cpp
@@ -97,8 +95,10 @@ SET(App_ExampleBrowser_SRCS
 
 	../../Extras/Serialize/BulletWorldImporter/btWorldImporter.cpp
 	../../Extras/Serialize/BulletWorldImporter/btBulletWorldImporter.cpp
-../../Extras/Serialize/BulletFileLoader/bChunk.cpp		../../Extras/Serialize/BulletFileLoader/bFile.cpp
+	../../Extras/Serialize/BulletFileLoader/bChunk.cpp		
-../../Extras/Serialize/BulletFileLoader/bDNA.cpp		../../Extras/Serialize/BulletFileLoader/btBulletFile.cpp
+	../../Extras/Serialize/BulletFileLoader/bFile.cpp
+	../../Extras/Serialize/BulletFileLoader/bDNA.cpp		
+	../../Extras/Serialize/BulletFileLoader/btBulletFile.cpp
 
 	../Importers/ImportBsp/BspLoader.h
   ../Importers/ImportBsp/ImportBspExample.h
@@ -168,42 +168,74 @@ SET(App_ExampleBrowser_SRCS
 	../ThirdPartyLibs/tinyxml/tinyxmlerror.cpp
 	../ThirdPartyLibs/tinyxml/tinyxmlparser.cpp
 
-
-	../ThirdPartyLibs/urdf/urdfdom/urdf_parser/src/pose.cpp
-		../ThirdPartyLibs/urdf/urdfdom/urdf_parser/src/model.cpp
-	../ThirdPartyLibs/urdf/urdfdom/urdf_parser/src/link.cpp
-	../ThirdPartyLibs/urdf/urdfdom/urdf_parser/src/joint.cpp
-	../ThirdPartyLibs/urdf/urdfdom/urdf_parser/include/urdf_parser/urdf_parser.h
-	../ThirdPartyLibs/urdf/urdfdom_headers/urdf_exception/include/urdf_exception/exception.h
-	../ThirdPartyLibs/urdf/urdfdom_headers/urdf_model/include/urdf_model/pose.h
-	../ThirdPartyLibs/urdf/urdfdom_headers/urdf_model/include/urdf_model/model.h
-	../ThirdPartyLibs/urdf/urdfdom_headers/urdf_model/include/urdf_model/link.h
-	../ThirdPartyLibs/urdf/urdfdom_headers/urdf_model/include/urdf_model/joint.h
 	../ThirdPartyLibs/tinyxml/tinystr.cpp
 	../ThirdPartyLibs/tinyxml/tinyxml.cpp
 	../ThirdPartyLibs/tinyxml/tinyxmlerror.cpp
 	../ThirdPartyLibs/tinyxml/tinyxmlparser.cpp
-	../ThirdPartyLibs/urdf/boost_replacement/lexical_cast.h
-	../ThirdPartyLibs/urdf/boost_replacement/shared_ptr.h
-	../ThirdPartyLibs/urdf/boost_replacement/printf_console.cpp
-	../ThirdPartyLibs/urdf/boost_replacement/printf_console.h
-	../ThirdPartyLibs/urdf/boost_replacement/string_split.cpp
-	../ThirdPartyLibs/urdf/boost_replacement/string_split.h
 	../Utils/b3Clock.cpp
 	../Utils/b3Clock.h
 	../Utils/b3ResourcePath.cpp
 	../Utils/b3ResourcePath.h
-	${ExampleBrowser_SRCS}
+	${GwenGUISupport_SRCS}
-	${ExampleBrowser_HDRS}
+	${GwenGUISupport_HDRS}
 	${BULLET_PHYSICS_SOURCE_DIR}/build3/bullet.rc
 )
 
+IF (WIN32)
+        INCLUDE_DIRECTORIES(
+                ${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs/Glew
+        )
+	IF (BUILD_SHARED_LIBS)
+		TARGET_LINK_LIBRARIES(
+			Bullet3Common BulletSoftBody BulletDynamics BulletCollision BulletInverseDynamicsUtils 
+			BulletInverseDynamics LinearMath OpenGLWindow gwen
+                	${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
+		)
+	ENDIF (BUILD_SHARED_LIBS)
+	ADD_DEFINITIONS(-DGLEW_STATIC)
+ELSE(WIN32)
+        IF(APPLE)
+                find_library(COCOA NAMES Cocoa)
+                MESSAGE(${COCOA})
+		IF (BUILD_SHARED_LIBS)
+                	TARGET_LINK_LIBRARIES(
+				Bullet3Common BulletSoftBody BulletDynamics BulletCollision BulletInverseDynamicsUtils
+                		BulletInverseDynamics LinearMath OpenGLWindow gwen
+				${COCOA} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
+			)
+  ELSE(APPLE)
+		ENDIF (BUILD_SHARED_LIBS)
+                ADD_DEFINITIONS("-DGLEW_INIT_OPENGL11_FUNCTIONS=1")
+                ADD_DEFINITIONS("-DGLEW_STATIC")
+                ADD_DEFINITIONS("-DGLEW_DYNAMIC_LOAD_ALL_GLX_FUNCTIONS=1")
+                INCLUDE_DIRECTORIES( ${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs/Glew )
+	 	IF (BUILD_SHARED_LIBS)	
+			TARGET_LINK_LIBRARIES(
+				Bullet3Common BulletSoftBody BulletDynamics BulletCollision BulletInverseDynamicsUtils
+               	 		BulletInverseDynamics LinearMath OpenGLWindow gwen
+          			pthread dl
+			)
+		ENDIF(BUILD_SHARED_LIBS)
+        ENDIF(APPLE)
+ENDIF(WIN32)
+
+
+ADD_LIBRARY(BulletExampleBrowserLib ${BulletExampleBrowser_SRCS} )
+SET_TARGET_PROPERTIES(BulletExampleBrowserLib PROPERTIES VERSION ${BULLET_VERSION})
+SET_TARGET_PROPERTIES(BulletExampleBrowserLib PROPERTIES SOVERSION ${BULLET_VERSION})
+
+INCLUDE_DIRECTORIES(
+        .
+        ${BULLET_PHYSICS_SOURCE_DIR}/src
+        ${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs
+)
+
+
 LINK_LIBRARIES(
-        Bullet3Common BulletSoftBody BulletDynamics BulletCollision BulletInverseDynamicsUtils BulletInverseDynamics LinearMath OpenGLWindow gwen
+        BulletExampleBrowserLib Bullet3Common BulletSoftBody BulletDynamics BulletCollision BulletInverseDynamicsUtils BulletInverseDynamics LinearMath OpenGLWindow gwen
 )
 
 IF (WIN32)
-	SET(App_ExampleBrowser_SRCS ${App_ExampleBrowser_SRCS} )
 	INCLUDE_DIRECTORIES(
 		${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs/Glew
 	)
@@ -229,7 +261,9 @@ ENDIF(WIN32)
 
 
 ADD_EXECUTABLE(App_ExampleBrowser
-		${App_ExampleBrowser_SRCS}
+		main.cpp
+		ExampleEntries.cpp
+		ExampleEntries.h
 )
 
 

examples/pybullet/CMakeLists.txt

@@ -0,0 +1,24 @@
+IF (BUILD_SHARED_LIBS)
+
+INCLUDE_DIRECTORIES( 
+		${BULLET_PHYSICS_SOURCE_DIR}/src
+		${BULLET_PHYSICS_SOURCE_DIR}/examples
+		${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs
+		/usr/include/python2.7
+  )
+
+SET(pybullet_SRCS
+	pybullet.c
+	../../examples/ExampleBrowser/ExampleEntries.cpp
+)
+
+
+ADD_LIBRARY(pybullet ${pybullet_SRCS})
+
+SET_TARGET_PROPERTIES(pybullet PROPERTIES VERSION ${BULLET_VERSION})
+SET_TARGET_PROPERTIES(pybullet PROPERTIES SOVERSION ${BULLET_VERSION})
+
+  TARGET_LINK_LIBRARIES(pybullet BulletExampleBrowserLib BulletSoftBody BulletDynamics BulletCollision BulletInverseDynamicsUtils BulletInverseDynamics LinearMath OpenGLWindow gwen Bullet3Common)
+ENDIF (BUILD_SHARED_LIBS)
+
+

examples/pybullet/premake4.lua

@@ -20,6 +20,7 @@ project ("pybullet")
                 ".",
                 "../../src",
                 "../ThirdPartyLibs",
+		"/usr/include/python2.7",
                 }