Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

pybullet pip/setup.py Linux fixes

Browse Source
This commit is contained in:
Erwin Coumans (Google)
2017-04-03 09:50:01 -07:00
parent 463cbf93de
commit c4cee21225
1 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
setup.py
View File

@@ -11,7 +11,6 @@ from glob import glob
#see http://stackoverflow.com/a/8719066/295157 #see http://stackoverflow.com/a/8719066/295157
import os import os
os.environ['LDFLAGS'] = '-framework Cocoa -framework OpenGL'
platform = get_platform() platform = get_platform()
@@ -24,6 +23,7 @@ CXX_FLAGS += '-DGWEN_COMPILE_STATIC '
# libraries += [current_python] # libraries += [current_python]
libraries = [""]
sources = ["examples/pybullet/pybullet.c"]\ sources = ["examples/pybullet/pybullet.c"]\
+["examples/ExampleBrowser/InProcessExampleBrowser.cpp"]\ +["examples/ExampleBrowser/InProcessExampleBrowser.cpp"]\
@@ -145,18 +145,18 @@ sources = ["examples/pybullet/pybullet.c"]\
+["src/BulletCollision/CollisionDispatch/btUnionFind.cpp"]\ +["src/BulletCollision/CollisionDispatch/btUnionFind.cpp"]\
+["src/BulletCollision/CollisionDispatch/btCollisionWorldImporter.cpp"]\ +["src/BulletCollision/CollisionDispatch/btCollisionWorldImporter.cpp"]\
+["src/BulletCollision/CollisionDispatch/btGhostObject.cpp"]\ +["src/BulletCollision/CollisionDispatch/btGhostObject.cpp"]\
+["src/BulletCollision/NarrowphaseCollision/btContinuousConvexCollision.cpp"]\ +["src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp"]\
+["src/BulletCollision/NarrowphaseCollision/btGjkEpaPenetrationDepthSolver.cpp"]\ +["src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp"]\
+["src/BulletCollision/NarrowphaseCollision/btPolyhedralContactClipping.cpp"]\ +["src/BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.cpp"]\
+["src/BulletCollision/NarrowphaseCollision/btConvexCast.cpp"]\ +["src/BulletCollision/NarrowPhaseCollision/btConvexCast.cpp"]\
+["src/BulletCollision/NarrowphaseCollision/btGjkPairDetector.cpp"]\ +["src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp"]\
+["src/BulletCollision/NarrowphaseCollision/btRaycastCallback.cpp"]\ +["src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp"]\
+["src/BulletCollision/NarrowphaseCollision/btGjkConvexCast.cpp"]\ +["src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.cpp"]\
+["src/BulletCollision/NarrowphaseCollision/btMinkowskiPenetrationDepthSolver.cpp"]\ +["src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp"]\
+["src/BulletCollision/NarrowphaseCollision/btSubSimplexConvexCast.cpp"]\ +["src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.cpp"]\
+["src/BulletCollision/NarrowphaseCollision/btGjkEpa2.cpp"]\ +["src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp"]\
+["src/BulletCollision/NarrowphaseCollision/btPersistentManifold.cpp"]\ +["src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp"]\
+["src/BulletCollision/NarrowphaseCollision/btVoronoiSimplexSolver.cpp"]\ +["src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp"]\
+["src/BulletCollision/CollisionShapes/btBox2dShape.cpp"]\ +["src/BulletCollision/CollisionShapes/btBox2dShape.cpp"]\
+["src/BulletCollision/CollisionShapes/btConvexPolyhedron.cpp"]\ +["src/BulletCollision/CollisionShapes/btConvexPolyhedron.cpp"]\
+["src/BulletCollision/CollisionShapes/btShapeHull.cpp"]\ +["src/BulletCollision/CollisionShapes/btShapeHull.cpp"]\
@@ -352,12 +352,22 @@ sources = ["examples/pybullet/pybullet.c"]\
+["examples/ThirdPartyLibs/Gwen/Renderers/OpenGL_DebugFont.cpp"]\ +["examples/ThirdPartyLibs/Gwen/Renderers/OpenGL_DebugFont.cpp"]\
if _platform == "linux" or _platform == "linux2": if _platform == "linux" or _platform == "linux2":
libraries += ['dl'] libraries += ['dl','pthread']
CXX_FLAGS += '-D_LINUX ' CXX_FLAGS += '-D_LINUX '
CXX_FLAGS += '-DGLEW_STATIC '
CXX_FLAGS += '-DGLEW_INIT_OPENGL11_FUNCTIONS=1 '
CXX_FLAGS += '-DGLEW_DYNAMIC_LOAD_ALL_GLX_FUNCTIONS=1 '
CXX_FLAGS += '-DDYNAMIC_LOAD_X11_FUNCTIONS '
CXX_FLAGS += '-DHAS_SOCKLEN_T ' CXX_FLAGS += '-DHAS_SOCKLEN_T '
CXX_FLAGS += '-fno-inline-functions-called-once' CXX_FLAGS += '-fno-inline-functions-called-once'
sources = ["examples/ThirdPartyLibs/enet/unix.c"]\
+["examples/OpenGLWindow/X11OpenGLWindow.cpp"]\
+["examples/ThirdPartyLibs/Glew/glew.c"]\
+ sources
elif _platform == "darwin": elif _platform == "darwin":
print("darwin!") print("darwin!")
os.environ['LDFLAGS'] = '-framework Cocoa -framework OpenGL'
CXX_FLAGS += '-DHAS_SOCKLEN_T ' CXX_FLAGS += '-DHAS_SOCKLEN_T '
CXX_FLAGS += '-D_DARWIN ' CXX_FLAGS += '-D_DARWIN '
# CXX_FLAGS += '-framework Cocoa ' # CXX_FLAGS += '-framework Cocoa '
@@ -367,7 +377,7 @@ elif _platform == "darwin":
setup( setup(
name = 'pybullet', name = 'pybullet',
version='0.1.1', version='0.1.3',
description='Official Python Interface for the Bullet Physics SDK Robotics Simulator', description='Official Python Interface for the Bullet Physics SDK Robotics Simulator',
long_description='pybullet is an easy to use Python module for physics simulation, robotics and machine learning based on the Bullet Physics SDK. With pybullet you can load articulated bodies from URDF, SDF and other file formats. pybullet provides forward dynamics simulation, inverse dynamics computation, forward and inverse kinematics and collision detection and ray intersection queries. Aside from physics simulation, pybullet supports to rendering, with a CPU renderer and OpenGL visualization and support for virtual reality headsets.', long_description='pybullet is an easy to use Python module for physics simulation, robotics and machine learning based on the Bullet Physics SDK. With pybullet you can load articulated bodies from URDF, SDF and other file formats. pybullet provides forward dynamics simulation, inverse dynamics computation, forward and inverse kinematics and collision detection and ray intersection queries. Aside from physics simulation, pybullet supports to rendering, with a CPU renderer and OpenGL visualization and support for virtual reality headsets.',
url='https://github.com/bulletphysics/bullet3', url='https://github.com/bulletphysics/bullet3',