From e954374e5616a5c7c49458874d15fe7871875bd6 Mon Sep 17 00:00:00 2001 From: Erwin Coumans Date: Sat, 13 May 2017 13:50:35 -0700 Subject: [PATCH] build system fixes --- examples/ExampleBrowser/CMakeLists.txt | 4 ++-- examples/ExampleBrowser/premake4.lua | 2 ++ examples/RobotSimulator/premake4.lua | 11 ++++++----- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/examples/ExampleBrowser/CMakeLists.txt b/examples/ExampleBrowser/CMakeLists.txt index 8b8d7cab6..23c283fcb 100644 --- a/examples/ExampleBrowser/CMakeLists.txt +++ b/examples/ExampleBrowser/CMakeLists.txt @@ -193,6 +193,8 @@ SET(BulletExampleBrowser_SRCS ../SharedMemory/PhysicsServerCommandProcessor.h ../SharedMemory/SharedMemoryCommands.h ../SharedMemory/SharedMemoryPublic.h + ../RobotSimulator/b3RobotSimulatorClientAPI.cpp + ../RobotSimulator/b3RobotSimulatorClientAPI.h ../BasicDemo/BasicExample.cpp ../BasicDemo/BasicExample.h ../InverseDynamics/InverseDynamicsExample.cpp @@ -254,8 +256,6 @@ SET(BulletExampleBrowser_SRCS ../RoboticsLearning/GripperGraspExample.cpp ../RoboticsLearning/GripperGraspExample.h - ../RoboticsLearning/b3RobotSimAPI.cpp - ../RoboticsLearning/b3RobotSimAPI.h ../RoboticsLearning/R2D2GraspExample.cpp ../RoboticsLearning/R2D2GraspExample.h ../RoboticsLearning/KukaGraspExample.cpp diff --git a/examples/ExampleBrowser/premake4.lua b/examples/ExampleBrowser/premake4.lua index dc1a0b4d1..e029b8edf 100644 --- a/examples/ExampleBrowser/premake4.lua +++ b/examples/ExampleBrowser/premake4.lua @@ -118,6 +118,8 @@ project "App_BulletExampleBrowser" "../MultiThreading/b3ThreadSupportInterface.cpp", "../InverseDynamics/InverseDynamicsExample.cpp", "../InverseDynamics/InverseDynamicsExample.h", + "../RobotSimulator/b3RobotSimulatorClientAPI.cpp", + "../RobotSimulator/b3RobotSimulatorClientAPI.h", "../BasicDemo/BasicExample.*", "../Tutorial/*", "../ExtendedTutorials/*", diff --git a/examples/RobotSimulator/premake4.lua b/examples/RobotSimulator/premake4.lua index df4cf88a5..f2cba47c7 100644 --- a/examples/RobotSimulator/premake4.lua +++ b/examples/RobotSimulator/premake4.lua @@ -199,6 +199,7 @@ if not _OPTIONS["no-enet"] then end +if _OPTIONS["serial"] then project ("App_VRGloveHandSimulator") @@ -248,12 +249,11 @@ project ("App_VRGloveHandSimulator") } defines {"B3_ENABLE_TINY_AUDIO"} - if _OPTIONS["serial"] then - defines{"B3_ENABLE_SERIAL"} - includedirs {"../../examples/ThirdPartyLibs/serial/include"} - links {"serial"} - end + defines{"B3_ENABLE_SERIAL"} + includedirs {"../../examples/ThirdPartyLibs/serial/include"} + links {"serial"} + if os.is("Windows") then links {"winmm","Wsock32","dsound"} defines {"WIN32","__WINDOWS_MM__","__WINDOWS_DS__"} @@ -280,3 +280,4 @@ project ("App_VRGloveHandSimulator") if os.is("Linux") then initX11() end +end \ No newline at end of file