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

premake build system fixes

Browse Source
This commit is contained in:
erwincoumans
2018-01-09 12:23:25 -08:00
parent e138e85bca
commit 15a429f1bf
10 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -219,7 +219,7 @@ ENDIF (USE_DOUBLE_PRECISION)
IF (NOT USE_SOFT_BODY_MULTI_BODY_DYNAMICS_WORLD) IF (NOT USE_SOFT_BODY_MULTI_BODY_DYNAMICS_WORLD)
ADD_DEFINITIONS(-DSKIP_SOFT_BODY_MULTI_BODY_DYNAMICS_WORLD) ADD_DEFINITIONS(-DSKIP_SOFT_BODY_MULTI_BODY_DYNAMICS_WORLD)
ENDIF (USE_SOFT_BODY_MULTI_BODY_DYNAMICS_WORLD) ENDIF ()
IF(USE_GRAPHICAL_BENCHMARK) IF(USE_GRAPHICAL_BENCHMARK)
ADD_DEFINITIONS( -DUSE_GRAPHICAL_BENCHMARK) ADD_DEFINITIONS( -DUSE_GRAPHICAL_BENCHMARK)

2
Extras/InverseDynamics/btMultiBodyFromURDF.hpp
View File

@@ -44,7 +44,7 @@ public:
void init() { void init() {
this->createEmptyDynamicsWorld(); this->createEmptyDynamicsWorld();
m_dynamicsWorld->setGravity(m_gravity); m_dynamicsWorld->setGravity(m_gravity);
BulletURDFImporter urdf_importer(&m_nogfx,0,1); BulletURDFImporter urdf_importer(&m_nogfx,0,1,0);
URDFImporterInterface &u2b(urdf_importer); URDFImporterInterface &u2b(urdf_importer);
bool loadOk = u2b.loadURDF(m_filename.c_str(), m_base_fixed); bool loadOk = u2b.loadURDF(m_filename.c_str(), m_base_fixed);

2
examples/Importers/ImportSDFDemo/ImportSDFSetup.cpp
View File

@@ -187,7 +187,7 @@ void ImportSDFSetup::initPhysics()
m_dynamicsWorld->setGravity(gravity); m_dynamicsWorld->setGravity(gravity);
BulletURDFImporter u2b(m_guiHelper, 0,1); BulletURDFImporter u2b(m_guiHelper, 0,1,0);
bool loadOk = u2b.loadSDF(m_fileName); bool loadOk = u2b.loadSDF(m_fileName);

2
examples/Importers/ImportURDFDemo/BulletUrdfImporter.h
View File

@@ -23,7 +23,7 @@ class BulletURDFImporter : public URDFImporterInterface
public: public:
BulletURDFImporter(struct GUIHelperInterface* helper, LinkVisualShapesConverter* customConverter, double globalScaling, int flags); BulletURDFImporter(struct GUIHelperInterface* helper, LinkVisualShapesConverter* customConverter, double globalScaling=1, int flags=0);
virtual ~BulletURDFImporter(); virtual ~BulletURDFImporter();

4
examples/Importers/ImportURDFDemo/ImportURDFSetup.cpp
View File

@@ -194,7 +194,9 @@ void ImportUrdfSetup::initPhysics()
} }
BulletURDFImporter u2b(m_guiHelper, 0,1); int flags=0;
double globalScaling=1;
BulletURDFImporter u2b(m_guiHelper, 0,globalScaling,flags);
bool loadOk = u2b.loadURDF(m_fileName); bool loadOk = u2b.loadURDF(m_fileName);

2
examples/InverseDynamics/InverseDynamicsExample.cpp
View File

@@ -156,7 +156,7 @@ void InverseDynamicsExample::initPhysics()
BulletURDFImporter u2b(m_guiHelper,0,1); BulletURDFImporter u2b(m_guiHelper,0,1,0);
bool loadOk = u2b.loadURDF("kuka_iiwa/model.urdf");// lwr / kuka.urdf"); bool loadOk = u2b.loadURDF("kuka_iiwa/model.urdf");// lwr / kuka.urdf");
if (loadOk) if (loadOk)
{ {

6
examples/SharedMemory/premake4.lua
View File

@@ -10,7 +10,7 @@ end
includedirs {".","../../src", "../ThirdPartyLibs"} includedirs {".","../../src", "../ThirdPartyLibs"}
links { links {
"Bullet3Common","BulletInverseDynamicsUtils", "BulletInverseDynamics", "BulletDynamics","BulletCollision", "LinearMath", "BussIK" "BulletSoftBody", "Bullet3Common","BulletInverseDynamicsUtils", "BulletInverseDynamics", "BulletDynamics","BulletCollision", "LinearMath", "BussIK"
} }
language "C++" language "C++"
@@ -163,7 +163,7 @@ defines {"B3_USE_STANDALONE_EXAMPLE"}
includedirs {"../../src", "../ThirdPartyLibs"} includedirs {"../../src", "../ThirdPartyLibs"}
links { links {
"BulletInverseDynamicsUtils", "BulletInverseDynamics", "BulletDynamics","BulletCollision", "LinearMath", "OpenGL_Window","Bullet3Common","BussIK" "BulletSoftBody", "BulletInverseDynamicsUtils", "BulletInverseDynamics", "BulletDynamics","BulletCollision", "LinearMath", "OpenGL_Window","Bullet3Common","BussIK"
} }
initOpenGL() initOpenGL()
initGlew() initGlew()
@@ -334,7 +334,7 @@ if os.is("Windows") then
} }
links { links {
"BulletInverseDynamicsUtils", "BulletInverseDynamics","Bullet3Common", "BulletDynamics","BulletCollision", "LinearMath","OpenGL_Window","openvr_api","BussIK" "BulletSoftBody", "BulletInverseDynamicsUtils", "BulletInverseDynamics","Bullet3Common", "BulletDynamics","BulletCollision", "LinearMath","OpenGL_Window","openvr_api","BussIK"
} }

2
examples/SharedMemory/tcp/premake4.lua
View File

@@ -62,7 +62,7 @@ defines { "NO_SHARED_MEMORY" }
includedirs {"..","../../../src", "../../ThirdPartyLibs","../../ThirdPartyLibs/clsocket/src"} includedirs {"..","../../../src", "../../ThirdPartyLibs","../../ThirdPartyLibs/clsocket/src"}
links { links {
"clsocket","Bullet3Common","BulletInverseDynamicsUtils", "BulletInverseDynamics", "BulletDynamics","BulletCollision", "LinearMath", "BussIK" "clsocket","Bullet3Common","BulletInverseDynamicsUtils", "BulletInverseDynamics", "BulletSoftBody", "BulletDynamics","BulletCollision", "LinearMath", "BussIK"
} }

2
examples/SharedMemory/udp/premake4.lua
View File

@@ -61,7 +61,7 @@ defines { "NO_SHARED_MEMORY" }
includedirs {"..","../../../src", "../../ThirdPartyLibs","../../ThirdPartyLibs/enet/include"} includedirs {"..","../../../src", "../../ThirdPartyLibs","../../ThirdPartyLibs/enet/include"}
links { links {
"enet","Bullet3Common","BulletInverseDynamicsUtils", "BulletInverseDynamics", "BulletDynamics","BulletCollision", "LinearMath", "BussIK" "enet","Bullet3Common","BulletInverseDynamicsUtils", "BulletInverseDynamics", "BulletSoftBody", "BulletDynamics","BulletCollision", "LinearMath", "BussIK"
} }
if os.is("Windows") then if os.is("Windows") then

6
test/SharedMemory/premake4.lua
View File

@@ -152,7 +152,7 @@ project ("Test_PhysicsServerLoopBack")
includedirs {"../../src", "../../examples", includedirs {"../../src", "../../examples",
"../../examples/ThirdPartyLibs"} "../../examples/ThirdPartyLibs"}
defines {"PHYSICS_LOOP_BACK"} defines {"PHYSICS_LOOP_BACK", "SKIP_SOFT_BODY_MULTI_BODY_DYNAMICS_WORLD"}
links { links {
"BulletInverseDynamicsUtils", "BulletInverseDynamicsUtils",
"BulletInverseDynamics", "BulletInverseDynamics",
@@ -238,7 +238,7 @@ end
includedirs {"../../src", "../../examples", includedirs {"../../src", "../../examples",
"../../examples/ThirdPartyLibs"} "../../examples/ThirdPartyLibs"}
defines {"PHYSICS_SERVER_DIRECT"} defines {"PHYSICS_SERVER_DIRECT","SKIP_SOFT_BODY_MULTI_BODY_DYNAMICS_WORLD"}
links { links {
"BulletInverseDynamicsUtils", "BulletInverseDynamicsUtils",
"BulletInverseDynamics", "BulletInverseDynamics",
@@ -321,7 +321,7 @@ project ("Test_PhysicsServerInProcessExampleBrowser")
includedirs {"../../src", "../../examples", includedirs {"../../src", "../../examples",
"../../examples/ThirdPartyLibs"} "../../examples/ThirdPartyLibs"}
defines {"PHYSICS_IN_PROCESS_EXAMPLE_BROWSER"} defines {"PHYSICS_IN_PROCESS_EXAMPLE_BROWSER", "SKIP_SOFT_BODY_MULTI_BODY_DYNAMICS_WORLD"}
-- links { -- links {
-- "BulletExampleBrowserLib", -- "BulletExampleBrowserLib",
-- "BulletFileLoader", -- "BulletFileLoader",