From aedc1da5897219cefb2e1d7bc65b759b9a3c38b6 Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Thu, 14 Mar 2019 23:42:35 +0100 Subject: [PATCH] build: remove built-in bullet compilation on Linux. Executables that use libbullet are now 1 MiB smaller (stripped!). --- build/autotools/m4/lol-conf.m4 | 10 +- build/lol-build | 1 - doc/samples/Makefile.am | 7 +- src/3rdparty/Makefile.am | 12 - src/3rdparty/README.md | 9 - src/3rdparty/lol-bullet.am | 674 --------------------------------- src/Makefile.am | 3 - 7 files changed, 9 insertions(+), 707 deletions(-) delete mode 100644 src/3rdparty/README.md delete mode 100644 src/3rdparty/lol-bullet.am diff --git a/build/autotools/m4/lol-conf.m4 b/build/autotools/m4/lol-conf.m4 index 093b2043..c6c45ae6 100644 --- a/build/autotools/m4/lol-conf.m4 +++ b/build/autotools/m4/lol-conf.m4 @@ -83,8 +83,12 @@ fi dnl Use Bullet Physics? ac_cv_my_have_bullet="no" if test "${enable_bullet}" != "no"; then - ac_cv_my_have_bullet="yes" - AC_DEFINE(LOL_USE_BULLET, 1, Define to 1 to use Bullet Physics) + PKG_CHECK_MODULES(BULLET, bullet, [ac_cv_my_have_bullet="yes"], [:]) + if test "${ac_cv_my_have_bullet}" != "no"; then + AC_DEFINE(LOL_USE_BULLET, 1, Define to 1 to use Bullet Physics) + LOL_CFLAGS="${LOL_CFLAGS} ${BULLET_CFLAGS}" + LOL_LIBS="${LOL_LIBS} ${BULLET_LIBS}" + fi fi AM_CONDITIONAL(LOL_USE_BULLET, test "${ac_cv_my_have_bullet}" = "yes") @@ -242,7 +246,6 @@ dnl How to use the Lol Engine outside this tree LOL_CFLAGS="$LOL_CFLAGS $SDL_CFLAGS $GL_CFLAGS $EGL_CFLAGS $LIBPNG_CFLAGS" LOL_LIBS="$LOL_LIBS $SDL_LIBS $GL_LIBS $EGL_LIBS $LIBPNG_LIBS $D3D_LIBS" LOL_DEPS="${LOL_DEPS} \$(lol_builddir)/src/liblol-core.a" -LOL_BULLET_DEPS="${LOL_BULLET_DEPS} \$(lol_builddir)/src/3rdparty/liblol-bullet.a" LOL_LUA_DEPS="${LOL_LUA_DEPS} \$(lol_builddir)/src/3rdparty/liblol-lua.a" dnl How to use the Lol Engine inside this tree @@ -256,7 +259,6 @@ dnl Extra flags AC_SUBST(LOL_CFLAGS) AC_SUBST(LOL_LIBS) AC_SUBST(LOL_DEPS) -AC_SUBST(LOL_BULLET_DEPS) AC_SUBST(LOL_LUA_DEPS) AC_SUBST(AM_CFLAGS) diff --git a/build/lol-build b/build/lol-build index 8258ac14..b316588a 100755 --- a/build/lol-build +++ b/build/lol-build @@ -283,7 +283,6 @@ build() win*-i386) # Because of locking issues in Wine’s winepath.exe, we only # build the static libraries in parallel. - make -j$LOL_PARALLEL -C src/3rdparty liblol-bullet.a make -j$LOL_PARALLEL -C src/3rdparty liblol-lua.a make -j$LOL_PARALLEL -C src/ liblol-core.a make diff --git a/doc/samples/Makefile.am b/doc/samples/Makefile.am index 55fb3276..bd4cd0e9 100644 --- a/doc/samples/Makefile.am +++ b/doc/samples/Makefile.am @@ -33,10 +33,9 @@ btphystest_SOURCES = \ physics/bulletcharactercontroller.cpp physics/bulletcharactercontroller.h \ \ front_camera_sprite.lolfx -btphystest_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/src/3rdparty/bullet3/src \ - -DHAVE_PHYS_USE_BULLET -btphystest_DEPENDENCIES = @LOL_DEPS@ @LOL_BULLET_DEPS@ -btphystest_LDFLAGS = $(AM_LDFLAGS) @LOL_BULLET_DEPS@ +btphystest_CPPFLAGS = $(AM_CPPFLAGS) +btphystest_DEPENDENCIES = @LOL_DEPS@ +btphystest_LDFLAGS = $(AM_LDFLAGS) if LOL_USE_EMSCRIPTEN btphystest_LDFLAGS += \ --preload-file data/CatsSheet.png \ diff --git a/src/3rdparty/Makefile.am b/src/3rdparty/Makefile.am index d8a4cd53..fe27f022 100644 --- a/src/3rdparty/Makefile.am +++ b/src/3rdparty/Makefile.am @@ -2,30 +2,18 @@ include $(top_srcdir)/build/autotools/common.am noinst_LIBRARIES = liblol-lua.a -if LOL_USE_BULLET -noinst_LIBRARIES += liblol-bullet.a -endif # Only remove flags that were actually set, because we don't know # what the compiler actually accepts. -disable_cflags_bullet = $(filter $(AM_CPPFLAGS:-W%=-Wno-%), \ - -Wno-shadow -Wno-unused -Wno-unused-parameter \ - -Wno-cast-align -Wno-cast-qual -Wno-strict-aliasing) disable_cflags_lua = $(filter $(AM_CPPFLAGS:-W%=-Wno-%), \ -Wno-cast-qual) -liblol_bullet_a_SOURCES = $(bullet_sources) -liblol_bullet_a_CPPFLAGS = -DB3_USE_CLEW $(AM_CPPFLAGS) -I$(srcdir)/bullet3/src $(disable_cflags_bullet) - -include lol-bullet.am - liblol_lua_a_SOURCES = $(lua_sources) liblol_lua_a_CPPFLAGS = $(AM_CPPFLAGS) -DLUA_ANSI $(disable_cflags_lua) include lol-lua.am EXTRA_DIST += $(imgui_sources) $(mingw_std_threads_sources) $(pegtl_sources) -EXTRA_DIST += lol-bullet.vcxproj lol-bullet.vcxproj.filters EXTRA_DIST += lol-lua.vcxproj lol-lua.vcxproj.filters include lol-mingw-std-threads.am diff --git a/src/3rdparty/README.md b/src/3rdparty/README.md deleted file mode 100644 index 27beee1e..00000000 --- a/src/3rdparty/README.md +++ /dev/null @@ -1,9 +0,0 @@ - -Generate vcxproj for Bullet: - - cat lol-bullet.am | \ - awk '/bullet_source/ { print " " } \ - /NULL/ { print " " } \ - /bullet3.*\.(c|cpp)\>/ { print " " } \ - /bullet3.*\.(h|hpp|cl)\>/ { print " " }' - diff --git a/src/3rdparty/lol-bullet.am b/src/3rdparty/lol-bullet.am deleted file mode 100644 index c475e3b3..00000000 --- a/src/3rdparty/lol-bullet.am +++ /dev/null @@ -1,674 +0,0 @@ - -bullet_sources = \ - bullet3/src/btBulletCollisionCommon.h \ - bullet3/src/btBulletDynamicsCommon.h \ - $(NULL) - -bullet_sources += \ - bullet3/src/Bullet3Collision/BroadPhaseCollision/b3BroadphaseCallback.h \ - bullet3/src/Bullet3Collision/BroadPhaseCollision/b3DynamicBvhBroadphase.cpp \ - bullet3/src/Bullet3Collision/BroadPhaseCollision/b3DynamicBvhBroadphase.h \ - bullet3/src/Bullet3Collision/BroadPhaseCollision/b3DynamicBvh.cpp \ - bullet3/src/Bullet3Collision/BroadPhaseCollision/b3DynamicBvh.h \ - bullet3/src/Bullet3Collision/BroadPhaseCollision/b3OverlappingPairCache.cpp \ - bullet3/src/Bullet3Collision/BroadPhaseCollision/b3OverlappingPairCache.h \ - bullet3/src/Bullet3Collision/BroadPhaseCollision/b3OverlappingPair.h \ - bullet3/src/Bullet3Collision/BroadPhaseCollision/shared/b3Aabb.h \ - bullet3/src/Bullet3Collision/NarrowPhaseCollision/b3Config.h \ - bullet3/src/Bullet3Collision/NarrowPhaseCollision/b3Contact4.h \ - bullet3/src/Bullet3Collision/NarrowPhaseCollision/b3ConvexUtility.cpp \ - bullet3/src/Bullet3Collision/NarrowPhaseCollision/b3ConvexUtility.h \ - bullet3/src/Bullet3Collision/NarrowPhaseCollision/b3CpuNarrowPhase.cpp \ - bullet3/src/Bullet3Collision/NarrowPhaseCollision/b3CpuNarrowPhase.h \ - bullet3/src/Bullet3Collision/NarrowPhaseCollision/b3RaycastInfo.h \ - bullet3/src/Bullet3Collision/NarrowPhaseCollision/b3RigidBodyCL.h \ - bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3BvhSubtreeInfoData.h \ - bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3BvhTraversal.h \ - bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3ClipFaces.h \ - bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3Collidable.h \ - bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3Contact4Data.h \ - bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3ContactConvexConvexSAT.h \ - bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3ContactSphereSphere.h \ - bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3ConvexPolyhedronData.h \ - bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3FindConcaveSatAxis.h \ - bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3FindSeparatingAxis.h \ - bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3MprPenetration.h \ - bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3NewContactReduction.h \ - bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3QuantizedBvhNodeData.h \ - bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3ReduceContacts.h \ - bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3RigidBodyData.h \ - bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3UpdateAabbs.h \ - $(NULL) - -bullet_sources += \ - bullet3/src/Bullet3Common/b3AlignedAllocator.cpp \ - bullet3/src/Bullet3Common/b3AlignedAllocator.h \ - bullet3/src/Bullet3Common/b3AlignedObjectArray.h \ - bullet3/src/Bullet3Common/b3CommandLineArgs.h \ - bullet3/src/Bullet3Common/b3FileUtils.h \ - bullet3/src/Bullet3Common/b3HashMap.h \ - bullet3/src/Bullet3Common/b3Logging.cpp \ - bullet3/src/Bullet3Common/b3Logging.h \ - bullet3/src/Bullet3Common/b3Matrix3x3.h \ - bullet3/src/Bullet3Common/b3MinMax.h \ - bullet3/src/Bullet3Common/b3PoolAllocator.h \ - bullet3/src/Bullet3Common/b3QuadWord.h \ - bullet3/src/Bullet3Common/b3Quaternion.h \ - bullet3/src/Bullet3Common/b3Random.h \ - bullet3/src/Bullet3Common/b3ResizablePool.h \ - bullet3/src/Bullet3Common/b3Scalar.h \ - bullet3/src/Bullet3Common/b3StackAlloc.h \ - bullet3/src/Bullet3Common/b3Transform.h \ - bullet3/src/Bullet3Common/b3TransformUtil.h \ - bullet3/src/Bullet3Common/b3Vector3.cpp \ - bullet3/src/Bullet3Common/b3Vector3.h \ - bullet3/src/Bullet3Common/shared/b3Float4.h \ - bullet3/src/Bullet3Common/shared/b3Int2.h \ - bullet3/src/Bullet3Common/shared/b3Int4.h \ - bullet3/src/Bullet3Common/shared/b3Mat3x3.h \ - bullet3/src/Bullet3Common/shared/b3PlatformDefinitions.h \ - bullet3/src/Bullet3Common/shared/b3Quat.h \ - $(NULL) - -bullet_sources += \ - bullet3/src/Bullet3Dynamics/b3CpuRigidBodyPipeline.cpp \ - bullet3/src/Bullet3Dynamics/b3CpuRigidBodyPipeline.h \ - bullet3/src/Bullet3Dynamics/ConstraintSolver/b3ContactSolverInfo.h \ - bullet3/src/Bullet3Dynamics/ConstraintSolver/b3FixedConstraint.cpp \ - bullet3/src/Bullet3Dynamics/ConstraintSolver/b3FixedConstraint.h \ - bullet3/src/Bullet3Dynamics/ConstraintSolver/b3Generic6DofConstraint.cpp \ - bullet3/src/Bullet3Dynamics/ConstraintSolver/b3Generic6DofConstraint.h \ - bullet3/src/Bullet3Dynamics/ConstraintSolver/b3JacobianEntry.h \ - bullet3/src/Bullet3Dynamics/ConstraintSolver/b3PgsJacobiSolver.cpp \ - bullet3/src/Bullet3Dynamics/ConstraintSolver/b3PgsJacobiSolver.h \ - bullet3/src/Bullet3Dynamics/ConstraintSolver/b3Point2PointConstraint.cpp \ - bullet3/src/Bullet3Dynamics/ConstraintSolver/b3Point2PointConstraint.h \ - bullet3/src/Bullet3Dynamics/ConstraintSolver/b3SolverBody.h \ - bullet3/src/Bullet3Dynamics/ConstraintSolver/b3SolverConstraint.h \ - bullet3/src/Bullet3Dynamics/ConstraintSolver/b3TypedConstraint.cpp \ - bullet3/src/Bullet3Dynamics/ConstraintSolver/b3TypedConstraint.h \ - bullet3/src/Bullet3Dynamics/shared/b3ContactConstraint4.h \ - bullet3/src/Bullet3Dynamics/shared/b3ConvertConstraint4.h \ - bullet3/src/Bullet3Dynamics/shared/b3Inertia.h \ - bullet3/src/Bullet3Dynamics/shared/b3IntegrateTransforms.h \ - $(NULL) - -bullet_sources += \ - bullet3/src/Bullet3Geometry/b3AabbUtil.h \ - bullet3/src/Bullet3Geometry/b3ConvexHullComputer.cpp \ - bullet3/src/Bullet3Geometry/b3ConvexHullComputer.h \ - bullet3/src/Bullet3Geometry/b3GeometryUtil.cpp \ - bullet3/src/Bullet3Geometry/b3GeometryUtil.h \ - bullet3/src/Bullet3Geometry/b3GrahamScan2dConvexHull.h \ - $(NULL) - -bullet_sources += \ - bullet3/src/Bullet3OpenCL/BroadphaseCollision/b3GpuBroadphaseInterface.h \ - bullet3/src/Bullet3OpenCL/BroadphaseCollision/b3GpuGridBroadphase.cpp \ - bullet3/src/Bullet3OpenCL/BroadphaseCollision/b3GpuGridBroadphase.h \ - bullet3/src/Bullet3OpenCL/BroadphaseCollision/b3GpuParallelLinearBvhBroadphase.cpp \ - bullet3/src/Bullet3OpenCL/BroadphaseCollision/b3GpuParallelLinearBvhBroadphase.h \ - bullet3/src/Bullet3OpenCL/BroadphaseCollision/b3GpuParallelLinearBvh.cpp \ - bullet3/src/Bullet3OpenCL/BroadphaseCollision/b3GpuParallelLinearBvh.h \ - bullet3/src/Bullet3OpenCL/BroadphaseCollision/b3GpuSapBroadphase.cpp \ - bullet3/src/Bullet3OpenCL/BroadphaseCollision/b3GpuSapBroadphase.h \ - bullet3/src/Bullet3OpenCL/BroadphaseCollision/b3SapAabb.h \ - bullet3/src/Bullet3OpenCL/BroadphaseCollision/kernels/gridBroadphase.cl \ - bullet3/src/Bullet3OpenCL/BroadphaseCollision/kernels/gridBroadphaseKernels.h \ - bullet3/src/Bullet3OpenCL/BroadphaseCollision/kernels/parallelLinearBvh.cl \ - bullet3/src/Bullet3OpenCL/BroadphaseCollision/kernels/parallelLinearBvhKernels.h \ - bullet3/src/Bullet3OpenCL/BroadphaseCollision/kernels/sap.cl \ - bullet3/src/Bullet3OpenCL/BroadphaseCollision/kernels/sapKernels.h \ - bullet3/src/Bullet3OpenCL/Initialize/b3OpenCLInclude.h \ - bullet3/src/Bullet3OpenCL/Initialize/b3OpenCLUtils.cpp \ - bullet3/src/Bullet3OpenCL/Initialize/b3OpenCLUtils.h \ - bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3BvhInfo.h \ - bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3ContactCache.cpp \ - bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3ContactCache.h \ - bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3ConvexHullContact.cpp \ - bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3ConvexHullContact.h \ - bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3ConvexPolyhedronCL.h \ - bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3GjkEpa.cpp \ - bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3GjkEpa.h \ - bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3OptimizedBvh.cpp \ - bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3OptimizedBvh.h \ - bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3QuantizedBvh.cpp \ - bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3QuantizedBvh.h \ - bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3StridingMeshInterface.cpp \ - bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3StridingMeshInterface.h \ - bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3SupportMappings.h \ - bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3TriangleCallback.cpp \ - bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3TriangleCallback.h \ - bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3TriangleIndexVertexArray.cpp \ - bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3TriangleIndexVertexArray.h \ - bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3VectorFloat4.h \ - bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3VoronoiSimplexSolver.cpp \ - bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3VoronoiSimplexSolver.h \ - bullet3/src/Bullet3OpenCL/NarrowphaseCollision/kernels/bvhTraversal.cl \ - bullet3/src/Bullet3OpenCL/NarrowphaseCollision/kernels/bvhTraversal.h \ - bullet3/src/Bullet3OpenCL/NarrowphaseCollision/kernels/mpr.cl \ - bullet3/src/Bullet3OpenCL/NarrowphaseCollision/kernels/mprKernels.h \ - bullet3/src/Bullet3OpenCL/NarrowphaseCollision/kernels/primitiveContacts.cl \ - bullet3/src/Bullet3OpenCL/NarrowphaseCollision/kernels/primitiveContacts.h \ - bullet3/src/Bullet3OpenCL/NarrowphaseCollision/kernels/sat.cl \ - bullet3/src/Bullet3OpenCL/NarrowphaseCollision/kernels/satClipHullContacts.cl \ - bullet3/src/Bullet3OpenCL/NarrowphaseCollision/kernels/satClipHullContacts.h \ - bullet3/src/Bullet3OpenCL/NarrowphaseCollision/kernels/satConcave.cl \ - bullet3/src/Bullet3OpenCL/NarrowphaseCollision/kernels/satConcaveKernels.h \ - bullet3/src/Bullet3OpenCL/NarrowphaseCollision/kernels/satKernels.h \ - bullet3/src/Bullet3OpenCL/ParallelPrimitives/b3BoundSearchCL.cpp \ - bullet3/src/Bullet3OpenCL/ParallelPrimitives/b3BoundSearchCL.h \ - bullet3/src/Bullet3OpenCL/ParallelPrimitives/b3BufferInfoCL.h \ - bullet3/src/Bullet3OpenCL/ParallelPrimitives/b3FillCL.cpp \ - bullet3/src/Bullet3OpenCL/ParallelPrimitives/b3FillCL.h \ - bullet3/src/Bullet3OpenCL/ParallelPrimitives/b3LauncherCL.cpp \ - bullet3/src/Bullet3OpenCL/ParallelPrimitives/b3LauncherCL.h \ - bullet3/src/Bullet3OpenCL/ParallelPrimitives/b3OpenCLArray.h \ - bullet3/src/Bullet3OpenCL/ParallelPrimitives/b3PrefixScanCL.cpp \ - bullet3/src/Bullet3OpenCL/ParallelPrimitives/b3PrefixScanCL.h \ - bullet3/src/Bullet3OpenCL/ParallelPrimitives/b3PrefixScanFloat4CL.cpp \ - bullet3/src/Bullet3OpenCL/ParallelPrimitives/b3PrefixScanFloat4CL.h \ - bullet3/src/Bullet3OpenCL/ParallelPrimitives/b3RadixSort32CL.cpp \ - bullet3/src/Bullet3OpenCL/ParallelPrimitives/b3RadixSort32CL.h \ - bullet3/src/Bullet3OpenCL/ParallelPrimitives/kernels/BoundSearchKernels.cl \ - bullet3/src/Bullet3OpenCL/ParallelPrimitives/kernels/BoundSearchKernelsCL.h \ - bullet3/src/Bullet3OpenCL/ParallelPrimitives/kernels/CopyKernels.cl \ - bullet3/src/Bullet3OpenCL/ParallelPrimitives/kernels/CopyKernelsCL.h \ - bullet3/src/Bullet3OpenCL/ParallelPrimitives/kernels/FillKernels.cl \ - bullet3/src/Bullet3OpenCL/ParallelPrimitives/kernels/FillKernelsCL.h \ - bullet3/src/Bullet3OpenCL/ParallelPrimitives/kernels/PrefixScanFloat4Kernels.cl \ - bullet3/src/Bullet3OpenCL/ParallelPrimitives/kernels/PrefixScanKernels.cl \ - bullet3/src/Bullet3OpenCL/ParallelPrimitives/kernels/PrefixScanKernelsCL.h \ - bullet3/src/Bullet3OpenCL/ParallelPrimitives/kernels/PrefixScanKernelsFloat4CL.h \ - bullet3/src/Bullet3OpenCL/ParallelPrimitives/kernels/RadixSort32Kernels.cl \ - bullet3/src/Bullet3OpenCL/ParallelPrimitives/kernels/RadixSort32KernelsCL.h \ - bullet3/src/Bullet3OpenCL/Raycast/b3GpuRaycast.cpp \ - bullet3/src/Bullet3OpenCL/Raycast/b3GpuRaycast.h \ - bullet3/src/Bullet3OpenCL/Raycast/kernels/rayCastKernels.cl \ - bullet3/src/Bullet3OpenCL/Raycast/kernels/rayCastKernels.h \ - bullet3/src/Bullet3OpenCL/RigidBody/b3GpuConstraint4.h \ - bullet3/src/Bullet3OpenCL/RigidBody/b3GpuGenericConstraint.cpp \ - bullet3/src/Bullet3OpenCL/RigidBody/b3GpuGenericConstraint.h \ - bullet3/src/Bullet3OpenCL/RigidBody/b3GpuJacobiContactSolver.cpp \ - bullet3/src/Bullet3OpenCL/RigidBody/b3GpuJacobiContactSolver.h \ - bullet3/src/Bullet3OpenCL/RigidBody/b3GpuNarrowPhase.cpp \ - bullet3/src/Bullet3OpenCL/RigidBody/b3GpuNarrowPhase.h \ - bullet3/src/Bullet3OpenCL/RigidBody/b3GpuNarrowPhaseInternalData.h \ - bullet3/src/Bullet3OpenCL/RigidBody/b3GpuPgsConstraintSolver.cpp \ - bullet3/src/Bullet3OpenCL/RigidBody/b3GpuPgsConstraintSolver.h \ - bullet3/src/Bullet3OpenCL/RigidBody/b3GpuPgsContactSolver.cpp \ - bullet3/src/Bullet3OpenCL/RigidBody/b3GpuPgsContactSolver.h \ - bullet3/src/Bullet3OpenCL/RigidBody/b3GpuRigidBodyPipeline.cpp \ - bullet3/src/Bullet3OpenCL/RigidBody/b3GpuRigidBodyPipeline.h \ - bullet3/src/Bullet3OpenCL/RigidBody/b3GpuRigidBodyPipelineInternalData.h \ - bullet3/src/Bullet3OpenCL/RigidBody/b3GpuSolverBody.h \ - bullet3/src/Bullet3OpenCL/RigidBody/b3GpuSolverConstraint.h \ - bullet3/src/Bullet3OpenCL/RigidBody/b3Solver.cpp \ - bullet3/src/Bullet3OpenCL/RigidBody/b3Solver.h \ - bullet3/src/Bullet3OpenCL/RigidBody/kernels/batchingKernels.cl \ - bullet3/src/Bullet3OpenCL/RigidBody/kernels/batchingKernels.h \ - bullet3/src/Bullet3OpenCL/RigidBody/kernels/batchingKernelsNew.cl \ - bullet3/src/Bullet3OpenCL/RigidBody/kernels/batchingKernelsNew.h \ - bullet3/src/Bullet3OpenCL/RigidBody/kernels/integrateKernel.cl \ - bullet3/src/Bullet3OpenCL/RigidBody/kernels/integrateKernel.h \ - bullet3/src/Bullet3OpenCL/RigidBody/kernels/jointSolver.cl \ - bullet3/src/Bullet3OpenCL/RigidBody/kernels/jointSolver.h \ - bullet3/src/Bullet3OpenCL/RigidBody/kernels/solveContact.cl \ - bullet3/src/Bullet3OpenCL/RigidBody/kernels/solveContact.h \ - bullet3/src/Bullet3OpenCL/RigidBody/kernels/solveFriction.cl \ - bullet3/src/Bullet3OpenCL/RigidBody/kernels/solveFriction.h \ - bullet3/src/Bullet3OpenCL/RigidBody/kernels/solverSetup2.cl \ - bullet3/src/Bullet3OpenCL/RigidBody/kernels/solverSetup2.h \ - bullet3/src/Bullet3OpenCL/RigidBody/kernels/solverSetup.cl \ - bullet3/src/Bullet3OpenCL/RigidBody/kernels/solverSetup.h \ - bullet3/src/Bullet3OpenCL/RigidBody/kernels/solverUtils.cl \ - bullet3/src/Bullet3OpenCL/RigidBody/kernels/solverUtils.h \ - bullet3/src/Bullet3OpenCL/RigidBody/kernels/updateAabbsKernel.cl \ - bullet3/src/Bullet3OpenCL/RigidBody/kernels/updateAabbsKernel.h \ - $(NULL) - -bullet_sources += \ - bullet3/src/Bullet3Serialize/Bullet2FileLoader/autogenerated/bullet2.h \ - bullet3/src/Bullet3Serialize/Bullet2FileLoader/b3BulletFile.cpp \ - bullet3/src/Bullet3Serialize/Bullet2FileLoader/b3BulletFile.h \ - bullet3/src/Bullet3Serialize/Bullet2FileLoader/b3Chunk.cpp \ - bullet3/src/Bullet3Serialize/Bullet2FileLoader/b3Chunk.h \ - bullet3/src/Bullet3Serialize/Bullet2FileLoader/b3Common.h \ - bullet3/src/Bullet3Serialize/Bullet2FileLoader/b3Defines.h \ - bullet3/src/Bullet3Serialize/Bullet2FileLoader/b3DNA.cpp \ - bullet3/src/Bullet3Serialize/Bullet2FileLoader/b3DNA.h \ - bullet3/src/Bullet3Serialize/Bullet2FileLoader/b3File.cpp \ - bullet3/src/Bullet3Serialize/Bullet2FileLoader/b3File.h \ - bullet3/src/Bullet3Serialize/Bullet2FileLoader/b3Serializer.cpp \ - bullet3/src/Bullet3Serialize/Bullet2FileLoader/b3Serializer.h \ - $(NULL) - -bullet_sources += \ - bullet3/src/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp \ - bullet3/src/BulletCollision/BroadphaseCollision/btAxisSweep3.h \ - bullet3/src/BulletCollision/BroadphaseCollision/btAxisSweep3Internal.h \ - bullet3/src/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h \ - bullet3/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.cpp \ - bullet3/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h \ - bullet3/src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.cpp \ - bullet3/src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h \ - bullet3/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp \ - bullet3/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h \ - bullet3/src/BulletCollision/BroadphaseCollision/btDbvt.cpp \ - bullet3/src/BulletCollision/BroadphaseCollision/btDbvt.h \ - bullet3/src/BulletCollision/BroadphaseCollision/btDispatcher.cpp \ - bullet3/src/BulletCollision/BroadphaseCollision/btDispatcher.h \ - bullet3/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp \ - bullet3/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h \ - bullet3/src/BulletCollision/BroadphaseCollision/btOverlappingPairCallback.h \ - bullet3/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp \ - bullet3/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h \ - bullet3/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp \ - bullet3/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.h \ - bullet3/src/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.cpp \ - bullet3/src/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.h \ - bullet3/src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.cpp \ - bullet3/src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.h \ - bullet3/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp \ - bullet3/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h \ - bullet3/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.cpp \ - bullet3/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.h \ - bullet3/src/BulletCollision/CollisionDispatch/btCollisionConfiguration.h \ - bullet3/src/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h \ - bullet3/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp \ - bullet3/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.h \ - bullet3/src/BulletCollision/CollisionDispatch/btCollisionDispatcherMt.cpp \ - bullet3/src/BulletCollision/CollisionDispatch/btCollisionDispatcherMt.h \ - bullet3/src/BulletCollision/CollisionDispatch/btCollisionObject.cpp \ - bullet3/src/BulletCollision/CollisionDispatch/btCollisionObject.h \ - bullet3/src/BulletCollision/CollisionDispatch/btCollisionObjectWrapper.h \ - bullet3/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp \ - bullet3/src/BulletCollision/CollisionDispatch/btCollisionWorld.h \ - bullet3/src/BulletCollision/CollisionDispatch/btCollisionWorldImporter.cpp \ - bullet3/src/BulletCollision/CollisionDispatch/btCollisionWorldImporter.h \ - bullet3/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp \ - bullet3/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h \ - bullet3/src/BulletCollision/CollisionDispatch/btCompoundCompoundCollisionAlgorithm.cpp \ - bullet3/src/BulletCollision/CollisionDispatch/btCompoundCompoundCollisionAlgorithm.h \ - bullet3/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.cpp \ - bullet3/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.h \ - bullet3/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp \ - bullet3/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h \ - bullet3/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp \ - bullet3/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h \ - bullet3/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp \ - bullet3/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h \ - bullet3/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp \ - bullet3/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h \ - bullet3/src/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.cpp \ - bullet3/src/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.h \ - bullet3/src/BulletCollision/CollisionDispatch/btGhostObject.cpp \ - bullet3/src/BulletCollision/CollisionDispatch/btGhostObject.h \ - bullet3/src/BulletCollision/CollisionDispatch/btHashedSimplePairCache.cpp \ - bullet3/src/BulletCollision/CollisionDispatch/btHashedSimplePairCache.h \ - bullet3/src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.cpp \ - bullet3/src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.h \ - bullet3/src/BulletCollision/CollisionDispatch/btManifoldResult.cpp \ - bullet3/src/BulletCollision/CollisionDispatch/btManifoldResult.h \ - bullet3/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp \ - bullet3/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.h \ - bullet3/src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp \ - bullet3/src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.h \ - bullet3/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp \ - bullet3/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h \ - bullet3/src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp \ - bullet3/src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h \ - bullet3/src/BulletCollision/CollisionDispatch/btUnionFind.cpp \ - bullet3/src/BulletCollision/CollisionDispatch/btUnionFind.h \ - bullet3/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.cpp \ - bullet3/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.h \ - bullet3/src/BulletCollision/CollisionShapes/btBox2dShape.cpp \ - bullet3/src/BulletCollision/CollisionShapes/btBox2dShape.h \ - bullet3/src/BulletCollision/CollisionShapes/btBoxShape.cpp \ - bullet3/src/BulletCollision/CollisionShapes/btBoxShape.h \ - bullet3/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp \ - bullet3/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h \ - bullet3/src/BulletCollision/CollisionShapes/btCapsuleShape.cpp \ - bullet3/src/BulletCollision/CollisionShapes/btCapsuleShape.h \ - bullet3/src/BulletCollision/CollisionShapes/btCollisionMargin.h \ - bullet3/src/BulletCollision/CollisionShapes/btCollisionShape.cpp \ - bullet3/src/BulletCollision/CollisionShapes/btCollisionShape.h \ - bullet3/src/BulletCollision/CollisionShapes/btCompoundShape.cpp \ - bullet3/src/BulletCollision/CollisionShapes/btCompoundShape.h \ - bullet3/src/BulletCollision/CollisionShapes/btConcaveShape.cpp \ - bullet3/src/BulletCollision/CollisionShapes/btConcaveShape.h \ - bullet3/src/BulletCollision/CollisionShapes/btConeShape.cpp \ - bullet3/src/BulletCollision/CollisionShapes/btConeShape.h \ - bullet3/src/BulletCollision/CollisionShapes/btConvex2dShape.cpp \ - bullet3/src/BulletCollision/CollisionShapes/btConvex2dShape.h \ - bullet3/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp \ - bullet3/src/BulletCollision/CollisionShapes/btConvexHullShape.h \ - bullet3/src/BulletCollision/CollisionShapes/btConvexInternalShape.cpp \ - bullet3/src/BulletCollision/CollisionShapes/btConvexInternalShape.h \ - bullet3/src/BulletCollision/CollisionShapes/btConvexPointCloudShape.cpp \ - bullet3/src/BulletCollision/CollisionShapes/btConvexPointCloudShape.h \ - bullet3/src/BulletCollision/CollisionShapes/btConvexPolyhedron.cpp \ - bullet3/src/BulletCollision/CollisionShapes/btConvexPolyhedron.h \ - bullet3/src/BulletCollision/CollisionShapes/btConvexShape.cpp \ - bullet3/src/BulletCollision/CollisionShapes/btConvexShape.h \ - bullet3/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp \ - bullet3/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h \ - bullet3/src/BulletCollision/CollisionShapes/btCylinderShape.cpp \ - bullet3/src/BulletCollision/CollisionShapes/btCylinderShape.h \ - bullet3/src/BulletCollision/CollisionShapes/btEmptyShape.cpp \ - bullet3/src/BulletCollision/CollisionShapes/btEmptyShape.h \ - bullet3/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp \ - bullet3/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h \ - bullet3/src/BulletCollision/CollisionShapes/btMaterial.h \ - bullet3/src/BulletCollision/CollisionShapes/btMiniSDF.cpp \ - bullet3/src/BulletCollision/CollisionShapes/btMiniSDF.h \ - bullet3/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp \ - bullet3/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.h \ - bullet3/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.cpp \ - bullet3/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h \ - bullet3/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp \ - bullet3/src/BulletCollision/CollisionShapes/btMultiSphereShape.h \ - bullet3/src/BulletCollision/CollisionShapes/btOptimizedBvh.cpp \ - bullet3/src/BulletCollision/CollisionShapes/btOptimizedBvh.h \ - bullet3/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp \ - bullet3/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h \ - bullet3/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp \ - bullet3/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h \ - bullet3/src/BulletCollision/CollisionShapes/btSdfCollisionShape.cpp \ - bullet3/src/BulletCollision/CollisionShapes/btSdfCollisionShape.h \ - bullet3/src/BulletCollision/CollisionShapes/btShapeHull.cpp \ - bullet3/src/BulletCollision/CollisionShapes/btShapeHull.h \ - bullet3/src/BulletCollision/CollisionShapes/btSphereShape.cpp \ - bullet3/src/BulletCollision/CollisionShapes/btSphereShape.h \ - bullet3/src/BulletCollision/CollisionShapes/btStaticPlaneShape.cpp \ - bullet3/src/BulletCollision/CollisionShapes/btStaticPlaneShape.h \ - bullet3/src/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp \ - bullet3/src/BulletCollision/CollisionShapes/btStridingMeshInterface.h \ - bullet3/src/BulletCollision/CollisionShapes/btTetrahedronShape.cpp \ - bullet3/src/BulletCollision/CollisionShapes/btTetrahedronShape.h \ - bullet3/src/BulletCollision/CollisionShapes/btTriangleBuffer.cpp \ - bullet3/src/BulletCollision/CollisionShapes/btTriangleBuffer.h \ - bullet3/src/BulletCollision/CollisionShapes/btTriangleCallback.cpp \ - bullet3/src/BulletCollision/CollisionShapes/btTriangleCallback.h \ - bullet3/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp \ - bullet3/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h \ - bullet3/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp \ - bullet3/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.h \ - bullet3/src/BulletCollision/CollisionShapes/btTriangleInfoMap.h \ - bullet3/src/BulletCollision/CollisionShapes/btTriangleMesh.cpp \ - bullet3/src/BulletCollision/CollisionShapes/btTriangleMesh.h \ - bullet3/src/BulletCollision/CollisionShapes/btTriangleMeshShape.cpp \ - bullet3/src/BulletCollision/CollisionShapes/btTriangleMeshShape.h \ - bullet3/src/BulletCollision/CollisionShapes/btTriangleShape.h \ - bullet3/src/BulletCollision/CollisionShapes/btUniformScalingShape.cpp \ - bullet3/src/BulletCollision/CollisionShapes/btUniformScalingShape.h \ - bullet3/src/BulletCollision/Gimpact/btBoxCollision.h \ - bullet3/src/BulletCollision/Gimpact/btClipPolygon.h \ - bullet3/src/BulletCollision/Gimpact/btCompoundFromGimpact.h \ - bullet3/src/BulletCollision/Gimpact/btContactProcessing.cpp \ - bullet3/src/BulletCollision/Gimpact/btContactProcessing.h \ - bullet3/src/BulletCollision/Gimpact/btContactProcessingStructs.h \ - bullet3/src/BulletCollision/Gimpact/btGenericPoolAllocator.cpp \ - bullet3/src/BulletCollision/Gimpact/btGenericPoolAllocator.h \ - bullet3/src/BulletCollision/Gimpact/btGeometryOperations.h \ - bullet3/src/BulletCollision/Gimpact/btGImpactBvh.cpp \ - bullet3/src/BulletCollision/Gimpact/btGImpactBvh.h \ - bullet3/src/BulletCollision/Gimpact/btGImpactBvhStructs.h \ - bullet3/src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.cpp \ - bullet3/src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h \ - bullet3/src/BulletCollision/Gimpact/btGImpactMassUtil.h \ - bullet3/src/BulletCollision/Gimpact/btGImpactQuantizedBvh.cpp \ - bullet3/src/BulletCollision/Gimpact/btGImpactQuantizedBvh.h \ - bullet3/src/BulletCollision/Gimpact/btGImpactQuantizedBvhStructs.h \ - bullet3/src/BulletCollision/Gimpact/btGImpactShape.cpp \ - bullet3/src/BulletCollision/Gimpact/btGImpactShape.h \ - bullet3/src/BulletCollision/Gimpact/btQuantization.h \ - bullet3/src/BulletCollision/Gimpact/btTriangleShapeEx.cpp \ - bullet3/src/BulletCollision/Gimpact/btTriangleShapeEx.h \ - bullet3/src/BulletCollision/Gimpact/gim_array.h \ - bullet3/src/BulletCollision/Gimpact/gim_basic_geometry_operations.h \ - bullet3/src/BulletCollision/Gimpact/gim_bitset.h \ - bullet3/src/BulletCollision/Gimpact/gim_box_collision.h \ - bullet3/src/BulletCollision/Gimpact/gim_box_set.cpp \ - bullet3/src/BulletCollision/Gimpact/gim_box_set.h \ - bullet3/src/BulletCollision/Gimpact/gim_clip_polygon.h \ - bullet3/src/BulletCollision/Gimpact/gim_contact.cpp \ - bullet3/src/BulletCollision/Gimpact/gim_contact.h \ - bullet3/src/BulletCollision/Gimpact/gim_geometry.h \ - bullet3/src/BulletCollision/Gimpact/gim_geom_types.h \ - bullet3/src/BulletCollision/Gimpact/gim_hash_table.h \ - bullet3/src/BulletCollision/Gimpact/gim_linear_math.h \ - bullet3/src/BulletCollision/Gimpact/gim_math.h \ - bullet3/src/BulletCollision/Gimpact/gim_memory.cpp \ - bullet3/src/BulletCollision/Gimpact/gim_memory.h \ - bullet3/src/BulletCollision/Gimpact/gim_radixsort.h \ - bullet3/src/BulletCollision/Gimpact/gim_tri_collision.cpp \ - bullet3/src/BulletCollision/Gimpact/gim_tri_collision.h \ - bullet3/src/BulletCollision/NarrowPhaseCollision/btComputeGjkEpaPenetration.h \ - bullet3/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp \ - bullet3/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.h \ - bullet3/src/BulletCollision/NarrowPhaseCollision/btConvexCast.cpp \ - bullet3/src/BulletCollision/NarrowPhaseCollision/btConvexCast.h \ - bullet3/src/BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h \ - bullet3/src/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h \ - bullet3/src/BulletCollision/NarrowPhaseCollision/btGjkCollisionDescription.h \ - bullet3/src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.cpp \ - bullet3/src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.h \ - bullet3/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp \ - bullet3/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.h \ - bullet3/src/BulletCollision/NarrowPhaseCollision/btGjkEpa3.h \ - bullet3/src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp \ - bullet3/src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h \ - bullet3/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp \ - bullet3/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h \ - bullet3/src/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h \ - bullet3/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp \ - bullet3/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h \ - bullet3/src/BulletCollision/NarrowPhaseCollision/btMprPenetration.h \ - bullet3/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp \ - bullet3/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h \ - bullet3/src/BulletCollision/NarrowPhaseCollision/btPointCollector.h \ - bullet3/src/BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.cpp \ - bullet3/src/BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.h \ - bullet3/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp \ - bullet3/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h \ - bullet3/src/BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h \ - bullet3/src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.cpp \ - bullet3/src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h \ - bullet3/src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp \ - bullet3/src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h \ - $(NULL) - -bullet_sources += \ - bullet3/src/BulletDynamics/Character/btCharacterControllerInterface.h \ - bullet3/src/BulletDynamics/Character/btKinematicCharacterController.cpp \ - bullet3/src/BulletDynamics/Character/btKinematicCharacterController.h \ - bullet3/src/BulletDynamics/ConstraintSolver/btBatchedConstraints.cpp \ - bullet3/src/BulletDynamics/ConstraintSolver/btBatchedConstraints.h \ - bullet3/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp \ - bullet3/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h \ - bullet3/src/BulletDynamics/ConstraintSolver/btConstraintSolver.h \ - bullet3/src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp \ - bullet3/src/BulletDynamics/ConstraintSolver/btContactConstraint.h \ - bullet3/src/BulletDynamics/ConstraintSolver/btContactSolverInfo.h \ - bullet3/src/BulletDynamics/ConstraintSolver/btFixedConstraint.cpp \ - bullet3/src/BulletDynamics/ConstraintSolver/btFixedConstraint.h \ - bullet3/src/BulletDynamics/ConstraintSolver/btGearConstraint.cpp \ - bullet3/src/BulletDynamics/ConstraintSolver/btGearConstraint.h \ - bullet3/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp \ - bullet3/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h \ - bullet3/src/BulletDynamics/ConstraintSolver/btGeneric6DofSpring2Constraint.cpp \ - bullet3/src/BulletDynamics/ConstraintSolver/btGeneric6DofSpring2Constraint.h \ - bullet3/src/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.cpp \ - bullet3/src/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.h \ - bullet3/src/BulletDynamics/ConstraintSolver/btHinge2Constraint.cpp \ - bullet3/src/BulletDynamics/ConstraintSolver/btHinge2Constraint.h \ - bullet3/src/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp \ - bullet3/src/BulletDynamics/ConstraintSolver/btHingeConstraint.h \ - bullet3/src/BulletDynamics/ConstraintSolver/btJacobianEntry.h \ - bullet3/src/BulletDynamics/ConstraintSolver/btNNCGConstraintSolver.cpp \ - bullet3/src/BulletDynamics/ConstraintSolver/btNNCGConstraintSolver.h \ - bullet3/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp \ - bullet3/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h \ - bullet3/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp \ - bullet3/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h \ - bullet3/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolverMt.cpp \ - bullet3/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolverMt.h \ - bullet3/src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp \ - bullet3/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h \ - bullet3/src/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.cpp \ - bullet3/src/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.h \ - bullet3/src/BulletDynamics/ConstraintSolver/btSolverBody.h \ - bullet3/src/BulletDynamics/ConstraintSolver/btSolverConstraint.h \ - bullet3/src/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp \ - bullet3/src/BulletDynamics/ConstraintSolver/btTypedConstraint.h \ - bullet3/src/BulletDynamics/ConstraintSolver/btUniversalConstraint.cpp \ - bullet3/src/BulletDynamics/ConstraintSolver/btUniversalConstraint.h \ - bullet3/src/BulletDynamics/Dynamics/btActionInterface.h \ - bullet3/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp \ - bullet3/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h \ - bullet3/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorldMt.cpp \ - bullet3/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorldMt.h \ - bullet3/src/BulletDynamics/Dynamics/btDynamicsWorld.h \ - bullet3/src/BulletDynamics/Dynamics/btRigidBody.cpp \ - bullet3/src/BulletDynamics/Dynamics/btRigidBody.h \ - bullet3/src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp \ - bullet3/src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.h \ - bullet3/src/BulletDynamics/Dynamics/btSimulationIslandManagerMt.cpp \ - bullet3/src/BulletDynamics/Dynamics/btSimulationIslandManagerMt.h \ - bullet3/src/BulletDynamics/Featherstone/btMultiBodyConstraint.cpp \ - bullet3/src/BulletDynamics/Featherstone/btMultiBodyConstraint.h \ - bullet3/src/BulletDynamics/Featherstone/btMultiBodyConstraintSolver.cpp \ - bullet3/src/BulletDynamics/Featherstone/btMultiBodyConstraintSolver.h \ - bullet3/src/BulletDynamics/Featherstone/btMultiBody.cpp \ - bullet3/src/BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.cpp \ - bullet3/src/BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.h \ - bullet3/src/BulletDynamics/Featherstone/btMultiBodyFixedConstraint.cpp \ - bullet3/src/BulletDynamics/Featherstone/btMultiBodyFixedConstraint.h \ - bullet3/src/BulletDynamics/Featherstone/btMultiBodyGearConstraint.cpp \ - bullet3/src/BulletDynamics/Featherstone/btMultiBodyGearConstraint.h \ - bullet3/src/BulletDynamics/Featherstone/btMultiBody.h \ - bullet3/src/BulletDynamics/Featherstone/btMultiBodyJointFeedback.h \ - bullet3/src/BulletDynamics/Featherstone/btMultiBodyJointLimitConstraint.cpp \ - bullet3/src/BulletDynamics/Featherstone/btMultiBodyJointLimitConstraint.h \ - bullet3/src/BulletDynamics/Featherstone/btMultiBodyJointMotor.cpp \ - bullet3/src/BulletDynamics/Featherstone/btMultiBodyJointMotor.h \ - bullet3/src/BulletDynamics/Featherstone/btMultiBodyLinkCollider.h \ - bullet3/src/BulletDynamics/Featherstone/btMultiBodyLink.h \ - bullet3/src/BulletDynamics/Featherstone/btMultiBodyPoint2Point.cpp \ - bullet3/src/BulletDynamics/Featherstone/btMultiBodyPoint2Point.h \ - bullet3/src/BulletDynamics/Featherstone/btMultiBodySliderConstraint.cpp \ - bullet3/src/BulletDynamics/Featherstone/btMultiBodySliderConstraint.h \ - bullet3/src/BulletDynamics/Featherstone/btMultiBodySolverConstraint.h \ - bullet3/src/BulletDynamics/Featherstone/btMultiBodySphericalJointMotor.cpp \ - bullet3/src/BulletDynamics/Featherstone/btMultiBodySphericalJointMotor.h \ - bullet3/src/BulletDynamics/MLCPSolvers/btDantzigLCP.cpp \ - bullet3/src/BulletDynamics/MLCPSolvers/btDantzigLCP.h \ - bullet3/src/BulletDynamics/MLCPSolvers/btDantzigSolver.h \ - bullet3/src/BulletDynamics/MLCPSolvers/btLemkeAlgorithm.cpp \ - bullet3/src/BulletDynamics/MLCPSolvers/btLemkeAlgorithm.h \ - bullet3/src/BulletDynamics/MLCPSolvers/btLemkeSolver.h \ - bullet3/src/BulletDynamics/MLCPSolvers/btMLCPSolver.cpp \ - bullet3/src/BulletDynamics/MLCPSolvers/btMLCPSolver.h \ - bullet3/src/BulletDynamics/MLCPSolvers/btMLCPSolverInterface.h \ - bullet3/src/BulletDynamics/MLCPSolvers/btPATHSolver.h \ - bullet3/src/BulletDynamics/MLCPSolvers/btSolveProjectedGaussSeidel.h \ - bullet3/src/BulletDynamics/Vehicle/btRaycastVehicle.cpp \ - bullet3/src/BulletDynamics/Vehicle/btRaycastVehicle.h \ - bullet3/src/BulletDynamics/Vehicle/btVehicleRaycaster.h \ - bullet3/src/BulletDynamics/Vehicle/btWheelInfo.cpp \ - bullet3/src/BulletDynamics/Vehicle/btWheelInfo.h \ - $(NULL) - -bullet_sources += \ - bullet3/src/BulletInverseDynamics/details/IDEigenInterface.hpp \ - bullet3/src/BulletInverseDynamics/details/IDLinearMathInterface.hpp \ - bullet3/src/BulletInverseDynamics/details/IDMatVec.hpp \ - bullet3/src/BulletInverseDynamics/details/MultiBodyTreeImpl.cpp \ - bullet3/src/BulletInverseDynamics/details/MultiBodyTreeImpl.hpp \ - bullet3/src/BulletInverseDynamics/details/MultiBodyTreeInitCache.cpp \ - bullet3/src/BulletInverseDynamics/details/MultiBodyTreeInitCache.hpp \ - bullet3/src/BulletInverseDynamics/IDConfigBuiltin.hpp \ - bullet3/src/BulletInverseDynamics/IDConfigEigen.hpp \ - bullet3/src/BulletInverseDynamics/IDConfig.hpp \ - bullet3/src/BulletInverseDynamics/IDErrorMessages.hpp \ - bullet3/src/BulletInverseDynamics/IDMath.cpp \ - bullet3/src/BulletInverseDynamics/IDMath.hpp \ - bullet3/src/BulletInverseDynamics/MultiBodyTree.cpp \ - bullet3/src/BulletInverseDynamics/MultiBodyTree.hpp \ - $(NULL) - -bullet_sources += \ - bullet3/src/BulletSoftBody/btDefaultSoftBodySolver.cpp \ - bullet3/src/BulletSoftBody/btDefaultSoftBodySolver.h \ - bullet3/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.cpp \ - bullet3/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h \ - bullet3/src/BulletSoftBody/btSoftBody.cpp \ - bullet3/src/BulletSoftBody/btSoftBodyData.h \ - bullet3/src/BulletSoftBody/btSoftBody.h \ - bullet3/src/BulletSoftBody/btSoftBodyHelpers.cpp \ - bullet3/src/BulletSoftBody/btSoftBodyHelpers.h \ - bullet3/src/BulletSoftBody/btSoftBodyInternals.h \ - bullet3/src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.cpp \ - bullet3/src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h \ - bullet3/src/BulletSoftBody/btSoftBodySolvers.h \ - bullet3/src/BulletSoftBody/btSoftBodySolverVertexBuffer.h \ - bullet3/src/BulletSoftBody/btSoftMultiBodyDynamicsWorld.cpp \ - bullet3/src/BulletSoftBody/btSoftMultiBodyDynamicsWorld.h \ - bullet3/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp \ - bullet3/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.h \ - bullet3/src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp \ - bullet3/src/BulletSoftBody/btSoftRigidDynamicsWorld.h \ - bullet3/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.cpp \ - bullet3/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.h \ - bullet3/src/BulletSoftBody/btSparseSDF.h \ - $(NULL) - -bullet_sources += \ - bullet3/src/LinearMath/btAabbUtil2.h \ - bullet3/src/LinearMath/btAlignedAllocator.cpp \ - bullet3/src/LinearMath/btAlignedAllocator.h \ - bullet3/src/LinearMath/btAlignedObjectArray.h \ - bullet3/src/LinearMath/btConvexHullComputer.cpp \ - bullet3/src/LinearMath/btConvexHullComputer.h \ - bullet3/src/LinearMath/btConvexHull.cpp \ - bullet3/src/LinearMath/btConvexHull.h \ - bullet3/src/LinearMath/btCpuFeatureUtility.h \ - bullet3/src/LinearMath/btDefaultMotionState.h \ - bullet3/src/LinearMath/btGeometryUtil.cpp \ - bullet3/src/LinearMath/btGeometryUtil.h \ - bullet3/src/LinearMath/btGrahamScan2dConvexHull.h \ - bullet3/src/LinearMath/btHashMap.h \ - bullet3/src/LinearMath/btIDebugDraw.h \ - bullet3/src/LinearMath/btList.h \ - bullet3/src/LinearMath/btMatrix3x3.h \ - bullet3/src/LinearMath/btMatrixX.h \ - bullet3/src/LinearMath/btMinMax.h \ - bullet3/src/LinearMath/btMotionState.h \ - bullet3/src/LinearMath/btPolarDecomposition.cpp \ - bullet3/src/LinearMath/btPolarDecomposition.h \ - bullet3/src/LinearMath/btPoolAllocator.h \ - bullet3/src/LinearMath/btQuadWord.h \ - bullet3/src/LinearMath/btQuaternion.h \ - bullet3/src/LinearMath/btQuickprof.cpp \ - bullet3/src/LinearMath/btQuickprof.h \ - bullet3/src/LinearMath/btRandom.h \ - bullet3/src/LinearMath/btScalar.h \ - bullet3/src/LinearMath/btSerializer64.cpp \ - bullet3/src/LinearMath/btSerializer.cpp \ - bullet3/src/LinearMath/btSerializer.h \ - bullet3/src/LinearMath/btSpatialAlgebra.h \ - bullet3/src/LinearMath/btStackAlloc.h \ - bullet3/src/LinearMath/btThreads.cpp \ - bullet3/src/LinearMath/btThreads.h \ - bullet3/src/LinearMath/btTransform.h \ - bullet3/src/LinearMath/btTransformUtil.h \ - bullet3/src/LinearMath/btVector3.cpp \ - bullet3/src/LinearMath/btVector3.h \ - $(NULL) - -bullet_sources += \ - bullet3/src/clew/clew.c \ - bullet3/src/clew/clew.h \ - $(NULL) - diff --git a/src/Makefile.am b/src/Makefile.am index da2a8a29..55f43977 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -25,9 +25,6 @@ liblol_core_a_SOURCES = \ $(d3d9_sources) \ $(android_sources) liblol_core_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/3rdparty/lua/src -if LOL_USE_BULLET -liblol_core_a_CPPFLAGS += -I$(srcdir)/3rdparty/bullet3/src -endif liblol_core_headers = \ lol/engine-internal.h lol/engine.h lol/public.h lol/extras.h lol/legacy.h \