Merge pull request #2537 from erwincoumans/master

fix pybullet_envs path, pybullet version to 2.6.0, allow clang-cl on Windows
This commit is contained in:
erwincoumans
2019-12-17 19:06:11 -08:00
committed by GitHub
31 changed files with 28192 additions and 43 deletions

View File

@@ -72,8 +72,6 @@ myfiles =
"plugins/collisionFilterPlugin/collisionFilterPlugin.cpp",
"plugins/pdControlPlugin/pdControlPlugin.cpp",
"plugins/pdControlPlugin/pdControlPlugin.h",
"../OpenGLWindow/SimpleCamera.cpp",
"../OpenGLWindow/SimpleCamera.h",
"../Importers/ImportURDFDemo/ConvertRigidBodies2MultiBody.h",
"../Importers/ImportURDFDemo/MultiBodyCreationInterface.h",
"../Importers/ImportURDFDemo/MyMultiBodyCreator.cpp",
@@ -115,6 +113,8 @@ myfiles =
files {
myfiles,
"../OpenGLWindow/SimpleCamera.cpp",
"../OpenGLWindow/SimpleCamera.h",
"main.cpp",
}