mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-09 13:44:32 +00:00
update bullet so it actually works
Moved the addSourceDirectory for physics/Bullet into the Engine/Source/CMakeLists.txt file that way it can actually appear where we expect it to in the solution explorer.
This commit is contained in:
marauder2k7
parent
c7be48130a
commit
13fa178cf6
5986 changed files with 1811270 additions and 453803 deletions
|
|
@ -3,7 +3,24 @@ project "App_BulletExampleBrowser"
|
|||
language "C++"
|
||||
|
||||
kind "ConsoleApp"
|
||||
|
||||
if os.is("Linux") then
|
||||
buildoptions{"-fPIC"}
|
||||
end
|
||||
|
||||
if _OPTIONS["enable_grpc"] then
|
||||
initGRPC()
|
||||
defines{"ENABLE_STATIC_GRPC_PLUGIN"}
|
||||
files {
|
||||
"../../examples/SharedMemory/PhysicsClientGRPC.cpp",
|
||||
"../../examples/SharedMemory/PhysicsClientGRPC.h",
|
||||
"../../examples/SharedMemory/PhysicsClientGRPC_C_API.cpp",
|
||||
"../../examples/SharedMemory/PhysicsClientGRPC_C_API.h",
|
||||
"../../examples/SharedMemory/plugins/grpcPlugin/grpcPlugin.cpp",
|
||||
|
||||
}
|
||||
end
|
||||
|
||||
hasCL = findOpenCL("clew")
|
||||
|
||||
if (hasCL) then
|
||||
|
|
@ -17,6 +34,7 @@ project "App_BulletExampleBrowser"
|
|||
includedirs {
|
||||
".",
|
||||
"../../src",
|
||||
"../../examples/SharedMemory",
|
||||
"../ThirdPartyLibs",
|
||||
}
|
||||
|
||||
|
|
@ -35,6 +53,28 @@ project "App_BulletExampleBrowser"
|
|||
}
|
||||
end
|
||||
|
||||
if _OPTIONS["audio"] then
|
||||
files {"../TinyAudio/*.cpp"}
|
||||
defines {"B3_ENABLE_TINY_AUDIO"}
|
||||
|
||||
if os.is("Windows") then
|
||||
links {"winmm","Wsock32","dsound"}
|
||||
defines {"WIN32","__WINDOWS_MM__","__WINDOWS_DS__"}
|
||||
end
|
||||
|
||||
if os.is("Linux") then initX11()
|
||||
defines {"__OS_LINUX__","__LINUX_ALSA__"}
|
||||
links {"asound","pthread"}
|
||||
end
|
||||
|
||||
|
||||
if os.is("MacOSX") then
|
||||
links{"Cocoa.framework"}
|
||||
links{"CoreAudio.framework", "coreMIDI.framework", "Cocoa.framework"}
|
||||
defines {"__OS_MACOSX__","__MACOSX_CORE__"}
|
||||
end
|
||||
end
|
||||
|
||||
if _OPTIONS["lua"] then
|
||||
includedirs{"../ThirdPartyLibs/lua-5.2.3/src"}
|
||||
links {"lua-5.2.3"}
|
||||
|
|
@ -49,7 +89,10 @@ project "App_BulletExampleBrowser"
|
|||
"main.cpp",
|
||||
"ExampleEntries.cpp",
|
||||
"../InverseKinematics/*",
|
||||
"../TinyRenderer/geometry.cpp",
|
||||
"../BulletRobotics/FixJointBoxes.cpp",
|
||||
"../BulletRobotics/BoxStack.cpp",
|
||||
"../BulletRobotics/JointLimit.cpp",
|
||||
"../TinyRenderer/geometry.cpp",
|
||||
"../TinyRenderer/model.cpp",
|
||||
"../TinyRenderer/tgaimage.cpp",
|
||||
"../TinyRenderer/our_gl.cpp",
|
||||
|
|
@ -59,11 +102,29 @@ project "App_BulletExampleBrowser"
|
|||
"../SharedMemory/PhysicsClientC_API.cpp",
|
||||
"../SharedMemory/PhysicsClientC_API.h",
|
||||
"../SharedMemory/PhysicsServerExample.cpp",
|
||||
"../SharedMemory/PhysicsServerExampleBullet2.cpp",
|
||||
"../SharedMemory/PhysicsClientExample.cpp",
|
||||
"../SharedMemory/PhysicsServer.cpp",
|
||||
"../SharedMemory/PhysicsServerSharedMemory.cpp",
|
||||
"../SharedMemory/PhysicsClientSharedMemory.cpp",
|
||||
"../SharedMemory/PhysicsClientSharedMemory_C_API.cpp",
|
||||
"../SharedMemory/PhysicsClientSharedMemory_C_API.h",
|
||||
"../SharedMemory/PhysicsClientSharedMemory2.cpp",
|
||||
"../SharedMemory/PhysicsClientSharedMemory2.h",
|
||||
"../SharedMemory/PhysicsClientSharedMemory2_C_API.cpp",
|
||||
"../SharedMemory/PhysicsClientSharedMemory2_C_API.h",
|
||||
"../SharedMemory/SharedMemoryCommandProcessor.cpp",
|
||||
"../SharedMemory/SharedMemoryCommandProcessor.h",
|
||||
"../SharedMemory/SharedMemoryInProcessPhysicsC_API.cpp",
|
||||
"../SharedMemory/GraphicsClientExample.cpp",
|
||||
"../SharedMemory/GraphicsClientExample.h",
|
||||
"../SharedMemory/GraphicsServerExample.cpp",
|
||||
"../SharedMemory/GraphicsServerExample.h",
|
||||
"../SharedMemory/GraphicsSharedMemoryBlock.h",
|
||||
"../SharedMemory/GraphicsSharedMemoryCommands.h",
|
||||
"../SharedMemory/GraphicsSharedMemoryPublic.h",
|
||||
"../SharedMemory/RemoteGUIHelper.cpp",
|
||||
"../SharedMemory/RemoteGUIHelper.h",
|
||||
"../SharedMemory/PhysicsClient.cpp",
|
||||
"../SharedMemory/PosixSharedMemory.cpp",
|
||||
"../SharedMemory/Win32SharedMemory.cpp",
|
||||
|
|
@ -78,22 +139,40 @@ project "App_BulletExampleBrowser"
|
|||
"../SharedMemory/PhysicsLoopBackC_API.h",
|
||||
"../SharedMemory/PhysicsServerCommandProcessor.cpp",
|
||||
"../SharedMemory/PhysicsServerCommandProcessor.h",
|
||||
"../SharedMemory/TinyRendererVisualShapeConverter.cpp",
|
||||
"../SharedMemory/TinyRendererVisualShapeConverter.h",
|
||||
"../SharedMemory/b3PluginManager.cpp",
|
||||
"../SharedMemory/plugins/collisionFilterPlugin/collisionFilterPlugin.cpp",
|
||||
"../SharedMemory/plugins/tinyRendererPlugin/TinyRendererVisualShapeConverter.cpp",
|
||||
"../SharedMemory/plugins/tinyRendererPlugin/tinyRendererPlugin.cpp",
|
||||
"../SharedMemory/plugins/pdControlPlugin/pdControlPlugin.cpp",
|
||||
"../SharedMemory/plugins/pdControlPlugin/pdControlPlugin.h",
|
||||
"../SharedMemory/SharedMemoryCommands.h",
|
||||
"../SharedMemory/SharedMemoryPublic.h",
|
||||
"../SharedMemory/b3RobotSimulatorClientAPI_NoGUI.cpp",
|
||||
"../SharedMemory/b3RobotSimulatorClientAPI_NoGUI.h",
|
||||
"../SharedMemory/b3RobotSimulatorClientAPI_NoDirect.cpp",
|
||||
"../SharedMemory/b3RobotSimulatorClientAPI_NoDirect.h",
|
||||
"../MultiThreading/MultiThreadingExample.cpp",
|
||||
"../MultiThreading/b3PosixThreadSupport.cpp",
|
||||
"../MultiThreading/b3Win32ThreadSupport.cpp",
|
||||
"../MultiThreading/b3ThreadSupportInterface.cpp",
|
||||
"../InverseDynamics/InverseDynamicsExample.cpp",
|
||||
"../InverseDynamics/InverseDynamicsExample.h",
|
||||
"../RobotSimulator/b3RobotSimulatorClientAPI.cpp",
|
||||
"../RobotSimulator/b3RobotSimulatorClientAPI.h",
|
||||
"../BasicDemo/BasicExample.*",
|
||||
"../Tutorial/*",
|
||||
"../ExtendedTutorials/*",
|
||||
"../Utils/RobotLoggingUtil.cpp",
|
||||
"../Utils/RobotLoggingUtil.h",
|
||||
"../Evolution/NN3DWalkers.cpp",
|
||||
"../Evolution/NN3DWalkers.h",
|
||||
"../Collision/*",
|
||||
"../RoboticsLearning/*",
|
||||
"../Collision/Internal/*",
|
||||
"../Benchmarks/*",
|
||||
"../CommonInterfaces/*",
|
||||
"../MultiThreadedDemo/*",
|
||||
"../Heightfield/HeightfieldExample.*",
|
||||
"../CommonInterfaces/*.h",
|
||||
"../ForkLift/ForkLiftDemo.*",
|
||||
"../Importers/**",
|
||||
"../../Extras/Serialize/BulletWorldImporter/*",
|
||||
|
|
@ -102,30 +181,52 @@ project "App_BulletExampleBrowser"
|
|||
"../RenderingExamples/*",
|
||||
"../VoronoiFracture/*",
|
||||
"../SoftDemo/*",
|
||||
"../DeformableDemo/*",
|
||||
"../ReducedDeformableDemo/*",
|
||||
"../RollingFrictionDemo/*",
|
||||
"../rbdl/*",
|
||||
"../FractureDemo/*",
|
||||
"../DynamicControlDemo/*",
|
||||
"../Constraints/*",
|
||||
"../Vehicles/*",
|
||||
"../Raycast/*",
|
||||
"../MultiBody/MultiDofDemo.cpp",
|
||||
"../MultiBody/SerialChains.cpp",
|
||||
"../MultiBody/TestJointTorqueSetup.cpp",
|
||||
"../MultiBody/Pendulum.cpp",
|
||||
"../MultiBody/MultiBodySoftContact.cpp",
|
||||
"../MultiBody/MultiBodyConstraintFeedback.cpp",
|
||||
"../MultiBody/InvertedPendulumPDControl.cpp",
|
||||
"../MultiBody/KinematicMultiBodyExample.cpp",
|
||||
"../RigidBody/RigidBodySoftContact.cpp",
|
||||
"../ThirdPartyLibs/stb_image/*",
|
||||
"../RigidBody/KinematicRigidBodyExample.cpp",
|
||||
"../ThirdPartyLibs/stb_image/stb_image.cpp",
|
||||
"../ThirdPartyLibs/Wavefront/tiny_obj_loader.*",
|
||||
"../ThirdPartyLibs/tinyxml/*",
|
||||
"../ThirdPartyLibs/BussIK/*",
|
||||
"../GyroscopicDemo/GyroscopicSetup.cpp",
|
||||
"../GyroscopicDemo/GyroscopicSetup.h",
|
||||
"../ThirdPartyLibs/tinyxml/tinystr.cpp",
|
||||
"../ThirdPartyLibs/tinyxml/tinyxml.cpp",
|
||||
"../ThirdPartyLibs/tinyxml/tinyxmlerror.cpp",
|
||||
"../ThirdPartyLibs/tinyxml/tinyxmlparser.cpp",
|
||||
"../ThirdPartyLibs/tinyxml2/tinyxml2.cpp",
|
||||
"../ThirdPartyLibs/tinyxml2/tinyxml2.h",
|
||||
}
|
||||
|
||||
if _OPTIONS["enable_stable_pd"] then
|
||||
defines {"STATIC_LINK_SPD_PLUGIN"}
|
||||
files {
|
||||
"../SharedMemory/plugins/stablePDPlugin/SpAlg.cpp",
|
||||
"../SharedMemory/plugins/stablePDPlugin/SpAlg.h",
|
||||
"../SharedMemory/plugins/stablePDPlugin/Shape.cpp",
|
||||
"../SharedMemory/plugins/stablePDPlugin/Shape.h",
|
||||
"../SharedMemory/plugins/stablePDPlugin/RBDUtil.cpp",
|
||||
"../SharedMemory/plugins/stablePDPlugin/RBDUtil.h",
|
||||
"../SharedMemory/plugins/stablePDPlugin/RBDModel.cpp",
|
||||
"../SharedMemory/plugins/stablePDPlugin/RBDModel.h",
|
||||
"../SharedMemory/plugins/stablePDPlugin/MathUtil.cpp",
|
||||
"../SharedMemory/plugins/stablePDPlugin/MathUtil.h",
|
||||
"../SharedMemory/plugins/stablePDPlugin/KinTree.cpp",
|
||||
"../SharedMemory/plugins/stablePDPlugin/KinTree.h",
|
||||
"../SharedMemory/plugins/stablePDPlugin/BulletConversion.cpp",
|
||||
"../SharedMemory/plugins/stablePDPlugin/BulletConversion.h",
|
||||
}
|
||||
end
|
||||
if (hasCL and findOpenGL3()) then
|
||||
files {
|
||||
"../OpenCL/broadphase/*",
|
||||
|
|
@ -134,6 +235,11 @@ if (hasCL and findOpenGL3()) then
|
|||
"../OpenCL/rigidbody/GpuRigidBodyDemo.cpp",
|
||||
}
|
||||
end
|
||||
|
||||
if (_OPTIONS["enable_static_vr_plugin"]) then
|
||||
files {"../../examples/SharedMemory/plugins/vrSyncPlugin/vrSyncPlugin.cpp"}
|
||||
end
|
||||
|
||||
if os.is("Linux") then
|
||||
initX11()
|
||||
end
|
||||
|
|
@ -161,6 +267,10 @@ project "BulletExampleBrowserLib"
|
|||
"../../src",
|
||||
"../ThirdPartyLibs",
|
||||
}
|
||||
|
||||
if os.is("Linux") then
|
||||
buildoptions{"-fPIC"}
|
||||
end
|
||||
|
||||
if _OPTIONS["lua"] then
|
||||
includedirs{"../ThirdPartyLibs/lua-5.2.3/src"}
|
||||
|
|
@ -169,6 +279,8 @@ project "BulletExampleBrowserLib"
|
|||
files {"../LuaDemo/LuaPhysicsSetup.cpp"}
|
||||
end
|
||||
|
||||
|
||||
|
||||
|
||||
initOpenGL()
|
||||
initGlew()
|
||||
|
|
@ -182,6 +294,9 @@ project "BulletExampleBrowserLib"
|
|||
"OpenGLGuiHelper.cpp",
|
||||
"OpenGLExampleBrowser.cpp",
|
||||
"../Utils/b3Clock.cpp",
|
||||
"../Utils/b3Clock.h",
|
||||
"../Utils/ChromeTraceUtil.cpp",
|
||||
"../Utils/ChromeTraceUtil.h",
|
||||
"*.h",
|
||||
"GwenGUISupport/*.cpp",
|
||||
"GwenGUISupport/*.h",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue