build system fixes

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

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/*",

examples/RobotSimulator/premake4.lua

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