mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-11 06:34:36 +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
|
|
@ -1,5 +1,5 @@
|
|||
|
||||
project "App_SharedMemoryPhysics"
|
||||
project "App_PhysicsServer_SharedMemory"
|
||||
|
||||
if _OPTIONS["ios"] then
|
||||
kind "WindowedApp"
|
||||
|
|
@ -7,27 +7,42 @@ else
|
|||
kind "ConsoleApp"
|
||||
end
|
||||
|
||||
includedirs {".","../../src", "../ThirdPartyLibs",}
|
||||
includedirs {".","../../src", "../ThirdPartyLibs"}
|
||||
|
||||
links {
|
||||
"Bullet3Common","BulletInverseDynamicsUtils", "BulletInverseDynamics", "BulletDynamics","BulletCollision", "LinearMath", "BussIK"
|
||||
"BulletSoftBody", "Bullet3Common","BulletInverseDynamicsUtils", "BulletInverseDynamics", "BulletDynamics","BulletCollision", "LinearMath", "BussIK"
|
||||
}
|
||||
if os.is("Linux") then
|
||||
links{"dl"}
|
||||
end
|
||||
|
||||
language "C++"
|
||||
|
||||
myfiles =
|
||||
{
|
||||
"b3RobotSimulatorClientAPI_NoDirect.cpp",
|
||||
"b3RobotSimulatorClientAPI_NoDirect.h",
|
||||
"IKTrajectoryHelper.cpp",
|
||||
"IKTrajectoryHelper.h",
|
||||
"PhysicsClient.cpp",
|
||||
"PhysicsClientSharedMemory.cpp",
|
||||
"PhysicsClientExample.cpp",
|
||||
"PhysicsServerExample.cpp",
|
||||
"PhysicsServerExampleBullet2.cpp",
|
||||
"PhysicsServerSharedMemory.cpp",
|
||||
"PhysicsServerSharedMemory.h",
|
||||
"PhysicsServer.cpp",
|
||||
"PhysicsServer.h",
|
||||
"PhysicsClientC_API.cpp",
|
||||
"GraphicsClientExample.cpp",
|
||||
"GraphicsClientExample.h",
|
||||
"GraphicsServerExample.cpp",
|
||||
"GraphicsServerExample.h",
|
||||
"GraphicsSharedMemoryBlock.h",
|
||||
"GraphicsSharedMemoryCommands.h",
|
||||
"GraphicsSharedMemoryPublic.h",
|
||||
"RemoteGUIHelper.cpp",
|
||||
"RemoteGUIHelper.h",
|
||||
"SharedMemoryCommands.h",
|
||||
"SharedMemoryPublic.h",
|
||||
"PhysicsServer.cpp",
|
||||
|
|
@ -42,17 +57,21 @@ myfiles =
|
|||
"PhysicsLoopBack.h",
|
||||
"PhysicsLoopBackC_API.cpp",
|
||||
"PhysicsLoopBackC_API.h",
|
||||
"PhysicsClientSharedMemory_C_API.cpp",
|
||||
"PhysicsClientSharedMemory_C_API.h",
|
||||
"PhysicsClientSharedMemory2_C_API.cpp",
|
||||
"PhysicsClientSharedMemory2_C_API.h",
|
||||
"PhysicsClientSharedMemory2.cpp",
|
||||
"PhysicsClientSharedMemory2.h",
|
||||
"SharedMemoryCommandProcessor.cpp",
|
||||
"SharedMemoryCommandProcessor.h",
|
||||
"PhysicsServerCommandProcessor.cpp",
|
||||
"PhysicsServerCommandProcessor.h",
|
||||
"TinyRendererVisualShapeConverter.cpp",
|
||||
"TinyRendererVisualShapeConverter.h",
|
||||
"../TinyRenderer/geometry.cpp",
|
||||
"../TinyRenderer/model.cpp",
|
||||
"../TinyRenderer/tgaimage.cpp",
|
||||
"../TinyRenderer/our_gl.cpp",
|
||||
"../TinyRenderer/TinyRenderer.cpp",
|
||||
"../OpenGLWindow/SimpleCamera.cpp",
|
||||
"../OpenGLWindow/SimpleCamera.h",
|
||||
"b3PluginManager.cpp",
|
||||
"b3PluginManager.h",
|
||||
"plugins/collisionFilterPlugin/collisionFilterPlugin.cpp",
|
||||
"plugins/pdControlPlugin/pdControlPlugin.cpp",
|
||||
"plugins/pdControlPlugin/pdControlPlugin.h",
|
||||
"../Importers/ImportURDFDemo/ConvertRigidBodies2MultiBody.h",
|
||||
"../Importers/ImportURDFDemo/MultiBodyCreationInterface.h",
|
||||
"../Importers/ImportURDFDemo/MyMultiBodyCreator.cpp",
|
||||
|
|
@ -65,8 +84,14 @@ myfiles =
|
|||
"../Importers/ImportURDFDemo/UrdfParser.h",
|
||||
"../Importers/ImportURDFDemo/URDF2Bullet.cpp",
|
||||
"../Importers/ImportURDFDemo/URDF2Bullet.h",
|
||||
"../Importers/ImportMJCFDemo/BulletMJCFImporter.cpp",
|
||||
"../Importers/ImportMJCFDemo/BulletMJCFImporter.h",
|
||||
"../Utils/b3ResourcePath.cpp",
|
||||
"../Utils/b3Clock.cpp",
|
||||
"../Utils/b3Clock.cpp",
|
||||
"../Utils/RobotLoggingUtil.cpp",
|
||||
"../Utils/RobotLoggingUtil.h",
|
||||
"../Utils/ChromeTraceUtil.cpp",
|
||||
"../Utils/ChromeTraceUtil.h",
|
||||
"../../Extras/Serialize/BulletWorldImporter/*",
|
||||
"../../Extras/Serialize/BulletFileLoader/*",
|
||||
"../Importers/ImportURDFDemo/URDFImporterInterface.h",
|
||||
|
|
@ -78,19 +103,40 @@ myfiles =
|
|||
"../Importers/ImportColladaDemo/LoadMeshFromCollada.cpp",
|
||||
"../Importers/ImportColladaDemo/ColladaGraphicsInstance.h",
|
||||
"../ThirdPartyLibs/Wavefront/tiny_obj_loader.cpp",
|
||||
"../ThirdPartyLibs/tinyxml/tinystr.cpp",
|
||||
"../ThirdPartyLibs/tinyxml/tinyxml.cpp",
|
||||
"../ThirdPartyLibs/tinyxml/tinyxmlerror.cpp",
|
||||
"../ThirdPartyLibs/tinyxml/tinyxmlparser.cpp",
|
||||
"../ThirdPartyLibs/tinyxml2/tinyxml2.cpp",
|
||||
"../Importers/ImportMeshUtility/b3ImportMeshUtility.cpp",
|
||||
"../ThirdPartyLibs/stb_image/stb_image.cpp",
|
||||
"../ThirdPartyLibs/stb_image/stb_image.cpp",
|
||||
"../ThirdPartyLibs/stb_image/stb_image_write.cpp",
|
||||
|
||||
}
|
||||
|
||||
|
||||
files {
|
||||
myfiles,
|
||||
"../OpenGLWindow/SimpleCamera.cpp",
|
||||
"../OpenGLWindow/SimpleCamera.h",
|
||||
"main.cpp",
|
||||
}
|
||||
|
||||
if (_OPTIONS["enable_static_vr_plugin"]) then
|
||||
defines("STATIC_LINK_VR_PLUGIN")
|
||||
files {"plugins/vrSyncPlugin/vrSyncPlugin.cpp"}
|
||||
end
|
||||
|
||||
if (_OPTIONS["enable_static_tinyrenderer_plugin"]) then
|
||||
files
|
||||
{
|
||||
"plugins/tinyRendererPlugin/tinyRendererPlugin.cpp",
|
||||
"plugins/tinyRendererPlugin/TinyRendererVisualShapeConverter.cpp",
|
||||
"../TinyRenderer/geometry.cpp",
|
||||
"../TinyRenderer/model.cpp",
|
||||
"../TinyRenderer/tgaimage.cpp",
|
||||
"../TinyRenderer/our_gl.cpp",
|
||||
"../TinyRenderer/TinyRenderer.cpp"
|
||||
}
|
||||
else
|
||||
defines("SKIP_STATIC_TINYRENDERER_PLUGIN")
|
||||
end
|
||||
|
||||
files {
|
||||
"../MultiThreading/b3ThreadSupportInterface.cpp",
|
||||
|
|
@ -127,7 +173,7 @@ files {
|
|||
end
|
||||
|
||||
|
||||
project "App_SharedMemoryPhysics_GUI"
|
||||
project "App_PhysicsServer_SharedMemory_GUI"
|
||||
|
||||
if _OPTIONS["ios"] then
|
||||
kind "WindowedApp"
|
||||
|
|
@ -139,13 +185,59 @@ defines {"B3_USE_STANDALONE_EXAMPLE"}
|
|||
includedirs {"../../src", "../ThirdPartyLibs"}
|
||||
|
||||
links {
|
||||
"BulletInverseDynamicsUtils", "BulletInverseDynamics", "BulletDynamics","BulletCollision", "LinearMath", "OpenGL_Window","Bullet3Common","BussIK"
|
||||
"BulletSoftBody", "BulletInverseDynamicsUtils", "BulletInverseDynamics", "BulletDynamics","BulletCollision", "LinearMath", "OpenGL_Window","Bullet3Common","BussIK"
|
||||
}
|
||||
initOpenGL()
|
||||
initGlew()
|
||||
|
||||
language "C++"
|
||||
|
||||
if _OPTIONS["midi"] then
|
||||
|
||||
defines {"B3_USE_MIDI"}
|
||||
|
||||
|
||||
|
||||
includedirs{"../ThirdPartyLibs/midi"}
|
||||
|
||||
files {
|
||||
"../ThirdPartyLibs/midi/RtMidi.cpp",
|
||||
"../ThirdPartyLibs/midi/RtMidi.h",
|
||||
"../ThirdPartyLibs/midi/RtError.h",
|
||||
}
|
||||
if os.is("Windows") then
|
||||
links {"winmm"}
|
||||
defines {"__WINDOWS_MM__", "WIN32"}
|
||||
end
|
||||
|
||||
if os.is("Linux") then
|
||||
defines {"__LINUX_ALSA__"}
|
||||
links {"asound","pthread"}
|
||||
end
|
||||
|
||||
if os.is("MacOSX") then
|
||||
links{"CoreAudio.framework", "coreMIDI.framework", "Cocoa.framework"}
|
||||
defines {"__MACOSX_CORE__"}
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
if ( _OPTIONS["enable_static_tinyrenderer_plugin"]) then
|
||||
files
|
||||
{
|
||||
"plugins/tinyRendererPlugin/tinyRendererPlugin.cpp",
|
||||
"plugins/tinyRendererPlugin/TinyRendererVisualShapeConverter.cpp",
|
||||
"../TinyRenderer/geometry.cpp",
|
||||
"../TinyRenderer/model.cpp",
|
||||
"../TinyRenderer/tgaimage.cpp",
|
||||
"../TinyRenderer/our_gl.cpp",
|
||||
"../TinyRenderer/TinyRenderer.cpp"
|
||||
}
|
||||
else
|
||||
defines("SKIP_STATIC_TINYRENDERER_PLUGIN")
|
||||
end
|
||||
|
||||
|
||||
files {
|
||||
myfiles,
|
||||
"../StandaloneMain/main_opengl_single_example.cpp",
|
||||
|
|
@ -153,6 +245,11 @@ files {
|
|||
"../ExampleBrowser/GL_ShapeDrawer.cpp",
|
||||
"../ExampleBrowser/CollisionShape2TriangleMesh.cpp",
|
||||
}
|
||||
if (_OPTIONS["enable_static_vr_plugin"]) then
|
||||
defines("STATIC_LINK_VR_PLUGIN")
|
||||
files {"plugins/vrSyncPlugin/vrSyncPlugin.cpp"}
|
||||
end
|
||||
|
||||
|
||||
if os.is("Linux") then initX11() end
|
||||
|
||||
|
|
@ -195,8 +292,10 @@ if os.is("MacOSX") then
|
|||
--defines {"__MACOSX_CORE__"}
|
||||
end
|
||||
|
||||
|
||||
|
||||
if os.is("Windows") then
|
||||
project "App_SharedMemoryPhysics_VR"
|
||||
project "App_PhysicsServer_SharedMemory_VR"
|
||||
--for now, only enable VR under Windows, until compilation issues are resolved on Mac/Linux
|
||||
defines {"B3_USE_STANDALONE_EXAMPLE","BT_ENABLE_VR"}
|
||||
|
||||
|
|
@ -205,7 +304,66 @@ if os.is("Windows") then
|
|||
else
|
||||
kind "ConsoleApp"
|
||||
end
|
||||
|
||||
if _OPTIONS["midi"] then
|
||||
|
||||
defines {"B3_USE_MIDI"}
|
||||
|
||||
|
||||
|
||||
includedirs{"../ThirdPartyLibs/midi"}
|
||||
|
||||
files {
|
||||
"../ThirdPartyLibs/midi/RtMidi.cpp",
|
||||
"../ThirdPartyLibs/midi/RtMidi.h",
|
||||
"../ThirdPartyLibs/midi/RtError.h",
|
||||
}
|
||||
if os.is("Windows") then
|
||||
links {"winmm"}
|
||||
defines {"__WINDOWS_MM__", "WIN32"}
|
||||
end
|
||||
|
||||
if os.is("Linux") then
|
||||
defines {"__LINUX_ALSA__"}
|
||||
links {"asound","pthread"}
|
||||
end
|
||||
|
||||
if os.is("MacOSX") then
|
||||
links{"CoreAudio.framework", "coreMIDI.framework", "Cocoa.framework"}
|
||||
defines {"__MACOSX_CORE__"}
|
||||
end
|
||||
|
||||
end
|
||||
if _OPTIONS["audio"] then
|
||||
files {
|
||||
"../TinyAudio/b3ADSR.cpp",
|
||||
"../TinyAudio/b3AudioListener.cpp",
|
||||
"../TinyAudio/b3ReadWavFile.cpp",
|
||||
"../TinyAudio/b3SoundEngine.cpp",
|
||||
"../TinyAudio/b3SoundSource.cpp",
|
||||
"../TinyAudio/b3WriteWavFile.cpp",
|
||||
"../TinyAudio/RtAudio.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
|
||||
includedirs {
|
||||
".","../../src", "../ThirdPartyLibs",
|
||||
"../ThirdPartyLibs/openvr/headers",
|
||||
|
|
@ -213,7 +371,7 @@ if os.is("Windows") then
|
|||
}
|
||||
|
||||
links {
|
||||
"BulletInverseDynamicsUtils", "BulletInverseDynamics","Bullet3Common", "BulletDynamics","BulletCollision", "LinearMath","OpenGL_Window","openvr_api","BussIK"
|
||||
"BulletSoftBody", "BulletInverseDynamicsUtils", "BulletInverseDynamics","Bullet3Common", "BulletDynamics","BulletCollision", "LinearMath","OpenGL_Window","openvr_api","BussIK"
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -223,7 +381,22 @@ if os.is("Windows") then
|
|||
initOpenGL()
|
||||
initGlew()
|
||||
|
||||
|
||||
if ( _OPTIONS["enable_static_tinyrenderer_plugin"]) then
|
||||
files
|
||||
{
|
||||
"plugins/tinyRendererPlugin/tinyRendererPlugin.cpp",
|
||||
"plugins/tinyRendererPlugin/TinyRendererVisualShapeConverter.cpp",
|
||||
"../TinyRenderer/geometry.cpp",
|
||||
"../TinyRenderer/model.cpp",
|
||||
"../TinyRenderer/tgaimage.cpp",
|
||||
"../TinyRenderer/our_gl.cpp",
|
||||
"../TinyRenderer/TinyRenderer.cpp"
|
||||
}
|
||||
else
|
||||
defines("SKIP_STATIC_TINYRENDERER_PLUGIN")
|
||||
end
|
||||
|
||||
|
||||
files
|
||||
{
|
||||
myfiles,
|
||||
|
|
@ -238,12 +411,22 @@ if os.is("Windows") then
|
|||
"../ThirdPartyLibs/openvr/samples/shared/lodepng.h",
|
||||
"../ThirdPartyLibs/openvr/samples/shared/Matrices.cpp",
|
||||
"../ThirdPartyLibs/openvr/samples/shared/Matrices.h",
|
||||
"../ThirdPartyLibs/openvr/samples/shared/strtools.cpp",
|
||||
"../ThirdPartyLibs/openvr/samples/shared/pathtools.cpp",
|
||||
"../ThirdPartyLibs/openvr/samples/shared/pathtools.h",
|
||||
"../ThirdPartyLibs/openvr/samples/shared/Vectors.h",
|
||||
}
|
||||
if (_OPTIONS["enable_static_vr_plugin"]) then
|
||||
defines("STATIC_LINK_VR_PLUGIN")
|
||||
files {"plugins/vrSyncPlugin/vrSyncPlugin.cpp"}
|
||||
end
|
||||
|
||||
if os.is("Windows") then
|
||||
libdirs {"../ThirdPartyLibs/openvr/lib/win32"}
|
||||
configuration {"x32"}
|
||||
libdirs {"../ThirdPartyLibs/openvr/lib/win32"}
|
||||
configuration {"x64"}
|
||||
libdirs {"../ThirdPartyLibs/openvr/lib/win64"}
|
||||
configuration{}
|
||||
end
|
||||
|
||||
if os.is("Linux") then initX11() end
|
||||
|
|
@ -288,4 +471,35 @@ if os.is("Windows") then
|
|||
end
|
||||
|
||||
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
include "udp"
|
||||
include "tcp"
|
||||
|
||||
if (_OPTIONS["enable_static_test_plugin"]) then
|
||||
include "plugins/testPlugin"
|
||||
end
|
||||
|
||||
if (_OPTIONS["enable_vr_sync_plugin"]) then
|
||||
include "plugins/vrSyncPlugin"
|
||||
end
|
||||
|
||||
if (_OPTIONS["enable_static_tiny_renderer__plugin"]) then
|
||||
include "plugins/tinyRendererPlugin"
|
||||
end
|
||||
if (_OPTIONS["enable_static_pd_control_plugin"]) then
|
||||
include "plugins/pdControlPlugin"
|
||||
end
|
||||
|
||||
if (_OPTIONS["enable_static_collision_filter_plugin"]) then
|
||||
include "plugins/collisionFilterPlugin"
|
||||
end
|
||||
if _OPTIONS["enable_egl"] then
|
||||
include "plugins/eglPlugin"
|
||||
end
|
||||
|
||||
if _OPTIONS["enable_grpc"] then
|
||||
include "grpc"
|
||||
include "plugins/grpcPlugin"
|
||||
end
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue