From cdd6954ada76701698fb2b0ba0a716c3e9e50c96 Mon Sep 17 00:00:00 2001
From: Erwin Coumans <erwincoumans@google.com>
Date: Wed, 18 May 2016 15:07:42 -0700
Subject: [PATCH] fix pybullet cmake compilation

---
 examples/pybullet/CMakeLists.txt | 47 ++++++++++++++++++++++++++++++--
 examples/pybullet/pybullet.c     |  8 +++++-
 2 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/examples/pybullet/CMakeLists.txt b/examples/pybullet/CMakeLists.txt
index 3aa78400e..70fd3f6af 100644
--- a/examples/pybullet/CMakeLists.txt
+++ b/examples/pybullet/CMakeLists.txt
@@ -8,7 +8,50 @@ INCLUDE_DIRECTORIES(
 
 SET(pybullet_SRCS
 	pybullet.c
-	../../examples/ExampleBrowser/ExampleEntries.cpp
+	../../examples/ExampleBrowser/InProcessExampleBrowser.cpp
+                        ../../examples/SharedMemory/InProcessMemory.cpp
+                        ../../examples/SharedMemory/PhysicsClient.cpp
+                        ../../examples/SharedMemory/PhysicsClient.h
+                        ../../examples/SharedMemory/PhysicsServer.cpp
+                        ../../examples/SharedMemory/PhysicsServer.h
+                        ../../examples/SharedMemory/PhysicsServerExample.cpp
+                        ../../examples/SharedMemory/SharedMemoryInProcessPhysicsC_API.cpp
+                        ../../examples/SharedMemory/PhysicsServerSharedMemory.cpp
+                        ../../examples/SharedMemory/PhysicsServerSharedMemory.h
+                        ../../examples/SharedMemory/PhysicsDirect.cpp
+                        ../../examples/SharedMemory/PhysicsDirect.h
+                        ../../examples/SharedMemory/PhysicsDirectC_API.cpp
+                        ../../examples/SharedMemory/PhysicsDirectC_API.h
+                        ../../examples/SharedMemory/PhysicsServerCommandProcessor.cpp
+                        ../../examples/SharedMemory/PhysicsServerCommandProcessor.h
+                        ../../examples/SharedMemory/PhysicsClientSharedMemory.cpp
+                        ../../examples/SharedMemory/PhysicsClientSharedMemory.h
+                        ../../examples/SharedMemory/PhysicsClientC_API.cpp
+                        ../../examples/SharedMemory/PhysicsClientC_API.h
+                        ../../examples/SharedMemory/Win32SharedMemory.cpp
+                        ../../examples/SharedMemory/Win32SharedMemory.h
+                        ../../examples/SharedMemory/PosixSharedMemory.cpp
+                        ../../examples/SharedMemory/PosixSharedMemory.h
+                        ../../examples/Utils/b3ResourcePath.cpp
+                        ../../examples/Utils/b3ResourcePath.h
+                        ../../examples/ThirdPartyLibs/tinyxml/tinystr.cpp
+                        ../../examples/ThirdPartyLibs/tinyxml/tinyxml.cpp
+                        ../../examples/ThirdPartyLibs/tinyxml/tinyxmlerror.cpp
+                        ../../examples/ThirdPartyLibs/tinyxml/tinyxmlparser.cpp
+                        ../../examples/ThirdPartyLibs/Wavefront/tiny_obj_loader.cpp
+                        ../../examples/ThirdPartyLibs/Wavefront/tiny_obj_loader.h
+                        ../../examples/Importers/ImportColladaDemo/LoadMeshFromCollada.cpp
+                        ../../examples/Importers/ImportObjDemo/LoadMeshFromObj.cpp
+                        ../../examples/Importers/ImportObjDemo/Wavefront2GLInstanceGraphicsShape.cpp
+                        ../../examples/Importers/ImportURDFDemo/BulletUrdfImporter.cpp
+                        ../../examples/Importers/ImportURDFDemo/MyMultiBodyCreator.cpp
+                        ../../examples/Importers/ImportURDFDemo/URDF2Bullet.cpp
+                        ../../examples/Importers/ImportURDFDemo/UrdfParser.cpp
+                        ../../examples/Importers/ImportURDFDemo/urdfStringSplit.cpp
+                        ../../examples/MultiThreading/b3PosixThreadSupport.cpp
+                        ../../examples/MultiThreading/b3Win32ThreadSupport.cpp
+			../../examples/MultiThreading/b3ThreadSupportInterface.cpp
+
 )
 
 IF(WIN32)
@@ -23,7 +66,7 @@ ADD_LIBRARY(pybullet SHARED ${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 ${PYTHON_LIBRARIES})
+TARGET_LINK_LIBRARIES(pybullet BulletExampleBrowserLib BulletFileLoader BulletWorldImporter BulletSoftBody BulletDynamics BulletCollision BulletInverseDynamicsUtils BulletInverseDynamics LinearMath OpenGLWindow gwen Bullet3Common ${PYTHON_LIBRARIES})
 
 
 
diff --git a/examples/pybullet/pybullet.c b/examples/pybullet/pybullet.c
index fd7daffc6..c25092588 100644
--- a/examples/pybullet/pybullet.c
+++ b/examples/pybullet/pybullet.c
@@ -329,10 +329,16 @@ initpybullet(void)
         SpamMethods, "Python bindings for Bullet");
 #endif
 
+#if PY_MAJOR_VERSION >= 3
     if (m == NULL)
         return m;
+#else
+    if (m == NULL)
+        return;
+#endif
+    
 	
-	PyModule_AddIntConstant (m, "SHARED_MEMORY", eCONNECT_SHARED_MEMORY); // user read 
+	PyModule_AddIntConstant (m, "SHARED_MEMORY", eCONNECT_SHARED_MEMORY); // user read
 	PyModule_AddIntConstant (m, "DIRECT", eCONNECT_DIRECT); // user read 
 	PyModule_AddIntConstant (m, "GUI", eCONNECT_GUI); // user read