diff options
author | Erwin Coumans <erwincoumans@google.com> | 2021-11-11 21:18:57 -0800 |
---|---|---|
committer | Erwin Coumans <erwincoumans@google.com> | 2021-11-11 21:18:57 -0800 |
commit | a3005879bba722cce4f13e79965917cda9b72014 (patch) | |
tree | 51191093a0b9d72786aff2361a299e525e9f6b2a | |
parent | e3b98615f1d990ace23a622254efebc06816c507 (diff) | |
download | bullet3-a3005879bba722cce4f13e79965917cda9b72014.tar.gz |
use mainthread on __APPLE__
remove duplicate SimpleCamera.cpp from cmakelists.txt
-rw-r--r-- | examples/TwoJoint/CMakeLists.txt | 2 | ||||
-rw-r--r-- | examples/TwoJoint/TwoJointMain.cpp | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/examples/TwoJoint/CMakeLists.txt b/examples/TwoJoint/CMakeLists.txt index 11a51f3bb..210f5ee3b 100644 --- a/examples/TwoJoint/CMakeLists.txt +++ b/examples/TwoJoint/CMakeLists.txt @@ -20,8 +20,6 @@ SET(RobotSimulator_SRCS ../../examples/ExampleBrowser/InProcessExampleBrowser.cpp ../../examples/SharedMemory/plugins/tinyRendererPlugin/tinyRendererPlugin.cpp ../../examples/SharedMemory/plugins/tinyRendererPlugin/TinyRendererVisualShapeConverter.cpp - ../../examples/OpenGLWindow/SimpleCamera.cpp - ../../examples/OpenGLWindow/SimpleCamera.h ../../examples/TinyRenderer/geometry.cpp ../../examples/TinyRenderer/model.cpp ../../examples/TinyRenderer/tgaimage.cpp diff --git a/examples/TwoJoint/TwoJointMain.cpp b/examples/TwoJoint/TwoJointMain.cpp index 8625bd483..df74b0d2f 100644 --- a/examples/TwoJoint/TwoJointMain.cpp +++ b/examples/TwoJoint/TwoJointMain.cpp @@ -29,7 +29,12 @@ std::map<std::string, int> jointNameToId; int main(int argc, char* argv[]) { +#ifdef __APPLE__ + kPhysClient = b3CreateInProcessPhysicsServerAndConnectMainThread(argc, argv); +#else kPhysClient = b3CreateInProcessPhysicsServerAndConnect(argc, argv); +#endif + if (!kPhysClient) return -1; // visualizer @@ -131,4 +136,4 @@ int main(int argc, char* argv[]) } b3DisconnectSharedMemory(kPhysClient); return 0; -}
\ No newline at end of file +} |