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

build system fixes

Browse Source
This commit is contained in:
Erwin Coumans
2017-05-13 13:50:35 -07:00
parent ef7a7f9004
commit e954374e56
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/ExampleBrowser/CMakeLists.txt
View File

@@ -193,6 +193,8 @@ SET(BulletExampleBrowser_SRCS
../SharedMemory/PhysicsServerCommandProcessor.h ../SharedMemory/PhysicsServerCommandProcessor.h
../SharedMemory/SharedMemoryCommands.h ../SharedMemory/SharedMemoryCommands.h
../SharedMemory/SharedMemoryPublic.h ../SharedMemory/SharedMemoryPublic.h
../RobotSimulator/b3RobotSimulatorClientAPI.cpp
../RobotSimulator/b3RobotSimulatorClientAPI.h
../BasicDemo/BasicExample.cpp ../BasicDemo/BasicExample.cpp
../BasicDemo/BasicExample.h ../BasicDemo/BasicExample.h
../InverseDynamics/InverseDynamicsExample.cpp ../InverseDynamics/InverseDynamicsExample.cpp
@@ -254,8 +256,6 @@ SET(BulletExampleBrowser_SRCS
../RoboticsLearning/GripperGraspExample.cpp ../RoboticsLearning/GripperGraspExample.cpp
../RoboticsLearning/GripperGraspExample.h ../RoboticsLearning/GripperGraspExample.h
../RoboticsLearning/b3RobotSimAPI.cpp
../RoboticsLearning/b3RobotSimAPI.h
../RoboticsLearning/R2D2GraspExample.cpp ../RoboticsLearning/R2D2GraspExample.cpp
../RoboticsLearning/R2D2GraspExample.h ../RoboticsLearning/R2D2GraspExample.h
../RoboticsLearning/KukaGraspExample.cpp ../RoboticsLearning/KukaGraspExample.cpp

2
examples/ExampleBrowser/premake4.lua
View File

@@ -118,6 +118,8 @@ project "App_BulletExampleBrowser"
"../MultiThreading/b3ThreadSupportInterface.cpp", "../MultiThreading/b3ThreadSupportInterface.cpp",
"../InverseDynamics/InverseDynamicsExample.cpp", "../InverseDynamics/InverseDynamicsExample.cpp",
"../InverseDynamics/InverseDynamicsExample.h", "../InverseDynamics/InverseDynamicsExample.h",
"../RobotSimulator/b3RobotSimulatorClientAPI.cpp",
"../RobotSimulator/b3RobotSimulatorClientAPI.h",
"../BasicDemo/BasicExample.*", "../BasicDemo/BasicExample.*",
"../Tutorial/*", "../Tutorial/*",
"../ExtendedTutorials/*", "../ExtendedTutorials/*",

5
examples/RobotSimulator/premake4.lua
View File

@@ -199,6 +199,7 @@ if not _OPTIONS["no-enet"] then
end end
if _OPTIONS["serial"] then
project ("App_VRGloveHandSimulator") project ("App_VRGloveHandSimulator")
@@ -248,11 +249,10 @@ project ("App_VRGloveHandSimulator")
} }
defines {"B3_ENABLE_TINY_AUDIO"} defines {"B3_ENABLE_TINY_AUDIO"}
if _OPTIONS["serial"] then
defines{"B3_ENABLE_SERIAL"} defines{"B3_ENABLE_SERIAL"}
includedirs {"../../examples/ThirdPartyLibs/serial/include"} includedirs {"../../examples/ThirdPartyLibs/serial/include"}
links {"serial"} links {"serial"}
end
if os.is("Windows") then if os.is("Windows") then
links {"winmm","Wsock32","dsound"} links {"winmm","Wsock32","dsound"}
@@ -280,3 +280,4 @@ project ("App_VRGloveHandSimulator")
if os.is("Linux") then if os.is("Linux") then
initX11() initX11()
end end
end