AuroraMiddleware/bullet3
1
0
Fork 0
mirror of https://github.com/bulletphysics/bullet3 synced 2024-12-13 21:30:09 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:erwincoumans/bullet3 into master

Browse Source
This commit is contained in:
Erwin Coumans 2020-12-15 16:24:36 -08:00
commit c97f09cf66
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -28,6 +28,7 @@ SET(CLAMP_VELOCITIES "0" CACHE STRING "Clamp rigid bodies' velocity to this valu
OPTION(USE_GRAPHICAL_BENCHMARK "Use Graphical Benchmark" ON)
OPTION(BUILD_SHARED_LIBS "Use shared libraries" OFF)
OPTION(USE_SOFT_BODY_MULTI_BODY_DYNAMICS_WORLD "Use btSoftMultiBodyDynamicsWorld" ON)
OPTION(USE_OPENVR "Use OpenVR for virtual reality" OFF)
OPTION(BULLET2_MULTITHREADING "Build Bullet 2 libraries with mutex locking around certain operations (required for multi-threading)" OFF)
IF (BULLET2_MULTITHREADING)

4
examples/SharedMemory/CMakeLists.txt
View File

@ -225,6 +225,8 @@ ENDIF(INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES)
#VR/OpenVR on Windows and Mac OSX
IF(USE_OPENVR)
IF (WIN32 OR APPLE)
INCLUDE_DIRECTORIES(
@ -413,3 +415,5 @@ ELSE(WIN32 OR APPLE)
ENDIF(INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES)
ENDIF(WIN32 OR APPLE)
ENDIF(USE_OPENVR)

2
examples/pybullet/pybullet.c
View File

@ -13066,7 +13066,7 @@ initpybullet(void)
SpamError = PyErr_NewException("pybullet.error", NULL, NULL);
Py_INCREF(SpamError);
PyModule_AddObject(m, "error", SpamError);
printf("pybullet build time: %s %s\n", __DATE__, __TIME__);
fprintf(stderr, "pybullet build time: %s %s\n", __DATE__, __TIME__);
Py_AtExit(b3pybulletExitFunc);