added ios static lib build to bullet extension

diff --git a/extensions/gdx-bullet/jni/Android.mk b/extensions/gdx-bullet/jni/Android.mk
index 83ccff0..aa7244f 100644 (file)
--- a/extensions/gdx-bullet/jni/Android.mk
+++ b/extensions/gdx-bullet/jni/Android.mk
@@ -10,154 +10,154 @@ LOCAL_LDLIBS := -lm
 LOCAL_ARM_MODE  := arm\r
  \r
 LOCAL_SRC_FILES := memcpy_wrap.c\
-       src/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp\
-       src/BulletSoftBody/btSoftSoftCollisionAlgorithm.cpp\
-       src/BulletSoftBody/btSoftBody.cpp\
-       src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.cpp\
-       src/BulletSoftBody/btSoftBodyHelpers.cpp\
-       src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.cpp\
-       src/BulletSoftBody/btDefaultSoftBodySolver.cpp\
-       src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp\
-       src/MiniCL/MiniCL.cpp\
-       src/MiniCL/MiniCLTask/MiniCLTask.cpp\
-       src/MiniCL/MiniCLTaskScheduler.cpp\
-       src/BulletDynamics/Character/btKinematicCharacterController.cpp\
-       src/BulletDynamics/Vehicle/btWheelInfo.cpp\
-       src/BulletDynamics/Vehicle/btRaycastVehicle.cpp\
-       src/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp\
-       src/BulletDynamics/ConstraintSolver/btHinge2Constraint.cpp\
-       src/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp\
-       src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp\
-       src/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.cpp\
-       src/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.cpp\
-       src/BulletDynamics/ConstraintSolver/btUniversalConstraint.cpp\
-       src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp\
-       src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp\
-       src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp\
-       src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp\
-       src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp\
-       src/BulletDynamics/Dynamics/Bullet-C-API.cpp\
-       src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp\
-       src/BulletDynamics/Dynamics/btRigidBody.cpp\
-       src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp\
-       src/BulletMultiThreaded/SpuSampleTask/SpuSampleTask.cpp\
-       src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuContactResult.cpp\
-       src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/boxBoxDistance.cpp\
-       src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuMinkowskiPenetrationDepthSolver.cpp\
-       src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuCollisionShapes.cpp\
-       src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.cpp\
-       src/BulletMultiThreaded/Win32ThreadSupport.cpp\
-       src/BulletMultiThreaded/SpuFakeDma.cpp\
-       src/BulletMultiThreaded/SequentialThreadSupport.cpp\
-       src/BulletMultiThreaded/SpuLibspe2Support.cpp\
-       src/BulletMultiThreaded/btGpu3DGridBroadphase.cpp\
-       src/BulletMultiThreaded/SpuCollisionTaskProcess.cpp\
-       src/BulletMultiThreaded/SpuSampleTaskProcess.cpp\
-       src/BulletMultiThreaded/SpuCollisionObjectWrapper.cpp\
-       src/BulletMultiThreaded/PosixThreadSupport.cpp\
-       src/BulletMultiThreaded/SpuGatheringCollisionDispatcher.cpp\
-       src/BulletMultiThreaded/btThreadSupportInterface.cpp\
-       src/BulletMultiThreaded/SpuContactManifoldCollisionAlgorithm.cpp\
-       src/BulletMultiThreaded/btParallelConstraintSolver.cpp\
-       src/LinearMath/btGeometryUtil.cpp\
-       src/LinearMath/btSerializer.cpp\
-       src/LinearMath/btVector3.cpp\
-       src/LinearMath/btQuickprof.cpp\
-       src/LinearMath/btAlignedAllocator.cpp\
-       src/LinearMath/btConvexHullComputer.cpp\
-       src/LinearMath/btConvexHull.cpp\
-       src/BulletCollision/Gimpact/gim_box_set.cpp\
-       src/BulletCollision/Gimpact/btGenericPoolAllocator.cpp\
-       src/BulletCollision/Gimpact/btGImpactShape.cpp\
-       src/BulletCollision/Gimpact/gim_memory.cpp\
-       src/BulletCollision/Gimpact/btGImpactQuantizedBvh.cpp\
-       src/BulletCollision/Gimpact/gim_tri_collision.cpp\
-       src/BulletCollision/Gimpact/btGImpactBvh.cpp\
-       src/BulletCollision/Gimpact/gim_contact.cpp\
-       src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.cpp\
-       src/BulletCollision/Gimpact/btTriangleShapeEx.cpp\
-       src/BulletCollision/Gimpact/btContactProcessing.cpp\
-       src/BulletCollision/CollisionShapes/btTriangleCallback.cpp\
-       src/BulletCollision/CollisionShapes/btCapsuleShape.cpp\
-       src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp\
-       src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp\
-       src/BulletCollision/CollisionShapes/btConvexPointCloudShape.cpp\
-       src/BulletCollision/CollisionShapes/btEmptyShape.cpp\
-       src/BulletCollision/CollisionShapes/btConvexShape.cpp\
-       src/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp\
-       src/BulletCollision/CollisionShapes/btTriangleMesh.cpp\
+       src/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp\
+       src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.cpp\
+       src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.cpp\
+       src/BulletCollision/BroadphaseCollision/btDbvt.cpp\
+       src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp\
+       src/BulletCollision/BroadphaseCollision/btDispatcher.cpp\
+       src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.cpp\
+       src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp\
+       src/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp\
+       src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp\
+       src/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.cpp\
+       src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.cpp\
+       src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp\
+       src/BulletCollision/CollisionDispatch/btBoxBoxDetector.cpp\
+       src/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp\
+       src/BulletCollision/CollisionDispatch/btCollisionObject.cpp\
+       src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp\
+       src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp\
+       src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.cpp\
+       src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp\
+       src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp\
+       src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp\
+       src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp\
+       src/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.cpp\
+       src/BulletCollision/CollisionDispatch/btGhostObject.cpp\
+       src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.cpp\
+       src/BulletCollision/CollisionDispatch/btManifoldResult.cpp\
+       src/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp\
+       src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp\
+       src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp\
+       src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp\
+       src/BulletCollision/CollisionDispatch/btUnionFind.cpp\
+       src/BulletCollision/CollisionDispatch/SphereTriangleDetector.cpp\
+       src/BulletCollision/CollisionShapes/btBox2dShape.cpp\
        src/BulletCollision/CollisionShapes/btBoxShape.cpp\
-       src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp\
-       src/BulletCollision/CollisionShapes/btStaticPlaneShape.cpp\
-       src/BulletCollision/CollisionShapes/btCompoundShape.cpp\
-       src/BulletCollision/CollisionShapes/btConvexHullShape.cpp\
-       src/BulletCollision/CollisionShapes/btConvex2dShape.cpp\
-       src/BulletCollision/CollisionShapes/btCylinderShape.cpp\
+       src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp\
+       src/BulletCollision/CollisionShapes/btCapsuleShape.cpp\
        src/BulletCollision/CollisionShapes/btCollisionShape.cpp\
+       src/BulletCollision/CollisionShapes/btCompoundShape.cpp\
        src/BulletCollision/CollisionShapes/btConcaveShape.cpp\
-       src/BulletCollision/CollisionShapes/btSphereShape.cpp\
-       src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.cpp\
-       src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp\
-       src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp\
-       src/BulletCollision/CollisionShapes/btConvexInternalShape.cpp\
-       src/BulletCollision/CollisionShapes/btShapeHull.cpp\
        src/BulletCollision/CollisionShapes/btConeShape.cpp\
-       src/BulletCollision/CollisionShapes/btUniformScalingShape.cpp\
-       src/BulletCollision/CollisionShapes/btTetrahedronShape.cpp\
-       src/BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp\
+       src/BulletCollision/CollisionShapes/btConvex2dShape.cpp\
+       src/BulletCollision/CollisionShapes/btConvexHullShape.cpp\
+       src/BulletCollision/CollisionShapes/btConvexInternalShape.cpp\
+       src/BulletCollision/CollisionShapes/btConvexPointCloudShape.cpp\
        src/BulletCollision/CollisionShapes/btConvexPolyhedron.cpp\
+       src/BulletCollision/CollisionShapes/btConvexShape.cpp\
        src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp\
+       src/BulletCollision/CollisionShapes/btCylinderShape.cpp\
+       src/BulletCollision/CollisionShapes/btEmptyShape.cpp\
        src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp\
+       src/BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp\
+       src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.cpp\
        src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp\
-       src/BulletCollision/CollisionShapes/btTriangleMeshShape.cpp\
-       src/BulletCollision/CollisionShapes/btTriangleBuffer.cpp\
        src/BulletCollision/CollisionShapes/btOptimizedBvh.cpp\
-       src/BulletCollision/CollisionShapes/btBox2dShape.cpp\
-       src/BulletCollision/CollisionDispatch/btGhostObject.cpp\
-       src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.cpp\
-       src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp\
-       src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp\
-       src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp\
-       src/BulletCollision/CollisionDispatch/btCollisionObject.cpp\
-       src/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp\
-       src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp\
-       src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.cpp\
-       src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp\
-       src/BulletCollision/CollisionDispatch/btBoxBoxDetector.cpp\
-       src/BulletCollision/CollisionDispatch/btManifoldResult.cpp\
-       src/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.cpp\
-       src/BulletCollision/CollisionDispatch/SphereTriangleDetector.cpp\
-       src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp\
-       src/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp\
-       src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp\
-       src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp\
-       src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp\
-       src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp\
-       src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.cpp\
-       src/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.cpp\
-       src/BulletCollision/CollisionDispatch/btUnionFind.cpp\
-       src/BulletCollision/BroadphaseCollision/btDbvt.cpp\
-       src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp\
-       src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.cpp\
-       src/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp\
-       src/BulletCollision/BroadphaseCollision/btDispatcher.cpp\
-       src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp\
-       src/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp\
-       src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.cpp\
-       src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.cpp\
-       src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp\
-       src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp\
+       src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp\
+       src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp\
+       src/BulletCollision/CollisionShapes/btShapeHull.cpp\
+       src/BulletCollision/CollisionShapes/btSphereShape.cpp\
+       src/BulletCollision/CollisionShapes/btStaticPlaneShape.cpp\
+       src/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp\
+       src/BulletCollision/CollisionShapes/btTetrahedronShape.cpp\
+       src/BulletCollision/CollisionShapes/btTriangleBuffer.cpp\
+       src/BulletCollision/CollisionShapes/btTriangleCallback.cpp\
+       src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp\
+       src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp\
+       src/BulletCollision/CollisionShapes/btTriangleMesh.cpp\
+       src/BulletCollision/CollisionShapes/btTriangleMeshShape.cpp\
+       src/BulletCollision/CollisionShapes/btUniformScalingShape.cpp\
+       src/BulletCollision/Gimpact/btContactProcessing.cpp\
+       src/BulletCollision/Gimpact/btGenericPoolAllocator.cpp\
+       src/BulletCollision/Gimpact/btGImpactBvh.cpp\
+       src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.cpp\
+       src/BulletCollision/Gimpact/btGImpactQuantizedBvh.cpp\
+       src/BulletCollision/Gimpact/btGImpactShape.cpp\
+       src/BulletCollision/Gimpact/btTriangleShapeEx.cpp\
+       src/BulletCollision/Gimpact/gim_box_set.cpp\
+       src/BulletCollision/Gimpact/gim_contact.cpp\
+       src/BulletCollision/Gimpact/gim_memory.cpp\
+       src/BulletCollision/Gimpact/gim_tri_collision.cpp\
+       src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp\
+       src/BulletCollision/NarrowPhaseCollision/btConvexCast.cpp\
+       src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.cpp\
+       src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp\
        src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp\
+       src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp\
        src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp\
-       src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp\
-       src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.cpp\
-       src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp\
+       src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp\
        src/BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.cpp\
+       src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp\
        src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.cpp\
-       src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp\
-       src/BulletCollision/NarrowPhaseCollision/btConvexCast.cpp\
        src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp\
-       src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp\
+       src/BulletDynamics/Character/btKinematicCharacterController.cpp\
+       src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp\
+       src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp\
+       src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp\
+       src/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.cpp\
+       src/BulletDynamics/ConstraintSolver/btHinge2Constraint.cpp\
+       src/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp\
+       src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp\
+       src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp\
+       src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp\
+       src/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.cpp\
+       src/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp\
+       src/BulletDynamics/ConstraintSolver/btUniversalConstraint.cpp\
+       src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp\
+       src/BulletDynamics/Dynamics/btRigidBody.cpp\
+       src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp\
+       src/BulletDynamics/Dynamics/Bullet-C-API.cpp\
+       src/BulletDynamics/Vehicle/btRaycastVehicle.cpp\
+       src/BulletDynamics/Vehicle/btWheelInfo.cpp\
+       src/BulletMultiThreaded/btGpu3DGridBroadphase.cpp\
+       src/BulletMultiThreaded/btParallelConstraintSolver.cpp\
+       src/BulletMultiThreaded/btThreadSupportInterface.cpp\
+       src/BulletMultiThreaded/PosixThreadSupport.cpp\
+       src/BulletMultiThreaded/SequentialThreadSupport.cpp\
+       src/BulletMultiThreaded/SpuCollisionObjectWrapper.cpp\
+       src/BulletMultiThreaded/SpuCollisionTaskProcess.cpp\
+       src/BulletMultiThreaded/SpuContactManifoldCollisionAlgorithm.cpp\
+       src/BulletMultiThreaded/SpuFakeDma.cpp\
+       src/BulletMultiThreaded/SpuGatheringCollisionDispatcher.cpp\
+       src/BulletMultiThreaded/SpuLibspe2Support.cpp\
+       src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/boxBoxDistance.cpp\
+       src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuCollisionShapes.cpp\
+       src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuContactResult.cpp\
+       src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.cpp\
+       src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuMinkowskiPenetrationDepthSolver.cpp\
+       src/BulletMultiThreaded/SpuSampleTask/SpuSampleTask.cpp\
+       src/BulletMultiThreaded/SpuSampleTaskProcess.cpp\
+       src/BulletMultiThreaded/Win32ThreadSupport.cpp\
+       src/BulletSoftBody/btDefaultSoftBodySolver.cpp\
+       src/BulletSoftBody/btSoftBody.cpp\
+       src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.cpp\
+       src/BulletSoftBody/btSoftBodyHelpers.cpp\
+       src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.cpp\
+       src/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp\
+       src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp\
+       src/BulletSoftBody/btSoftSoftCollisionAlgorithm.cpp\
+       src/LinearMath/btAlignedAllocator.cpp\
+       src/LinearMath/btConvexHull.cpp\
+       src/LinearMath/btConvexHullComputer.cpp\
+       src/LinearMath/btGeometryUtil.cpp\
+       src/LinearMath/btQuickprof.cpp\
+       src/LinearMath/btSerializer.cpp\
+       src/LinearMath/btVector3.cpp\
+       src/MiniCL/MiniCL.cpp\
+       src/MiniCL/MiniCLTask/MiniCLTask.cpp\
+       src/MiniCL/MiniCLTaskScheduler.cpp\
        swig-src/gdxBullet_wrap.cpp
  \r
 include $(BUILD_SHARED_LIBRARY)\r

diff --git a/extensions/gdx-bullet/jni/build-ios32.xml b/extensions/gdx-bullet/jni/build-ios32.xml
new file mode 100755 (executable)
index 0000000..634fbd5
--- /dev/null
+++ b/extensions/gdx-bullet/jni/build-ios32.xml
@@ -0,0 +1,192 @@
+<project name="gdx-bullet-IOS-32" basedir="." default="postcompile">\r
+       <!-- include the environment -->\r
+       <property environment="env"/>   \r
+       <!-- output directory for temporary object files -->\r
+       <property name="buildDir" value="target/ios32" />\r
+       <!-- output directory for the shared library -->\r
+       <property name="libsDir" value="../libs/ios32" />\r
+       <!-- the name of the shared library -->\r
+       <property name="libName" value="libgdx-bullet.a"/>\r
+       <!-- the jni header jniPlatform to use -->\r
+       <property name="jniPlatform" value="mac"/>\r
+       <!-- the compilerPrefix for the C & C++ compilers -->\r
+       <property name="compilerPrefix" value=""/>      \r
+       <property name="iphoneos-platform" value="/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin"/>\r
+       <property name="iphoneos-sdk" value="/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS6.0.sdk/"/>\r
+       <property name="iphonesimulator-platform" value="/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin"/>\r
+       <property name="iphonesimulator-sdk" value="/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator6.0.sdk/"/>\r
+       \r
+       <!-- define gcc compiler, options and files to compile -->\r
+       <property name="gcc" value="${compilerPrefix}gcc"/>     \r
+       <property name="gcc-opts" value="-c -Wall -O2"/>\r
+       <fileset id="gcc-files" dir="./">\r
+               <exclude name="target/"/>               \r
+                               <include name="memcpy_wrap.c"/>
+               <include name="**/*.c"/>
+\r
+                               <exclude name="src/BulletMultiThreaded/GpuSoftBodySolvers/**"/>
+\r
+       </fileset>\r
+       \r
+       <!-- define g++ compiler, options and files to compile -->\r
+       <property name="g++" value="${compilerPrefix}g++"/>\r
+       <property name="g++-opts" value="-c -Wall -O2 -fno-strict-aliasing -fno-rtti -DBT_NO_PROFILE"/>\r
+       <fileset id="g++-files" dir="./">\r
+               <exclude name="target/"/>\r
+                               <include name="**/*.cpp"/>
+\r
+                               <exclude name="src/BulletMultiThreaded/GpuSoftBodySolvers/**"/>
+\r
+       </fileset>\r
+\r
+       <!-- define linker and options -->\r
+       <property name="linker" value="${compilerPrefix}ar"/>\r
+       <property name="linker-opts" value="rcs"/>\r
+       <property name="libraries" value=""/>\r
+       \r
+       <!-- cleans the build directory, removes all object files and shared libs -->\r
+       <target name="clean">\r
+               <delete includeemptydirs="true" quiet="true">\r
+                       <fileset dir="${buildDir}"/>\r
+                       <fileset dir="${libsDir}" includes="**/*" excludes="**/.svn"/>\r
+               </delete>\r
+       </target>\r
+       \r
+       <target name="clean-objfiles">\r
+               <delete>\r
+                       <fileset dir="${buildDir}">\r
+                               <include name="**/*.o"/>\r
+                       </fileset>\r
+               </delete>\r
+       </target>\r
+       \r
+       <target name="create-build-dir">\r
+               <!-- FIXME this is pretty nasty :/ -->\r
+               <copy todir="${buildDir}">\r
+                       <fileset refid="g++-files"/>\r
+                       <fileset refid="gcc-files"/>\r
+               </copy>\r
+               <delete>\r
+                       <fileset dir="${buildDir}">\r
+                               <include name="*"/>\r
+                               <exclude name="*.o"/>\r
+                       </fileset>\r
+               </delete>\r
+       </target>\r
+\r
+       <!-- compiles all C and C++ files to object files in the build directory, for 386 builds-->\r
+       <target name="compile-386" depends="clean,create-build-dir">\r
+               <mkdir dir="${buildDir}"/>\r
+               <apply failonerror="true" executable="${iphonesimulator-platform}/${g++}" dest="${buildDir}" verbose="true">\r
+                       <arg line="-isysroot ${iphonesimulator-sdk} -arch i386 ${g++-opts}"/>\r
+                       <arg value="-Ijni-headers"/>\r
+                       <arg value="-Ijni-headers/${jniPlatform}"/>\r
+                       <arg value="-I."/>\r
+                                               <arg value="-Isrc/"/>
+\r
+                       <srcfile/>\r
+                       <arg value="-o"/>\r
+                       <targetfile/>\r
+                       <fileset refid="g++-files"/>\r
+                       <compositemapper>\r
+                               <mapper type="glob" from="*.cpp" to="*.o"/>\r
+                               <mapper type="glob" from="*.mm" to="*.o"/>\r
+                       </compositemapper>\r
+               </apply>\r
+               <apply failonerror="true" executable="${iphonesimulator-platform}/${gcc}" dest="${buildDir}" verbose="true">\r
+                       <arg line="-isysroot ${iphonesimulator-sdk} -arch i386 ${gcc-opts}"/>\r
+                       <arg value="-Ijni-headers"/>\r
+                       <arg value="-Ijni-headers/${jniPlatform}"/>\r
+                       <arg value="-I."/>\r
+                                               <arg value="-Isrc/"/>
+\r
+                       <srcfile/>\r
+                       <arg value="-o"/>\r
+                       <targetfile/>\r
+                       <fileset refid="gcc-files"/>\r
+                       <compositemapper>\r
+                               <mapper type="glob" from="*.c" to="*.o"/>\r
+                       </compositemapper>\r
+               </apply>\r
+       </target>       \r
+\r
+       <!-- links the shared library based on the previously compiled object files -->\r
+       <target name="link-386" depends="compile-386">\r
+               <fileset dir="${buildDir}" id="objFileSet">\r
+                       <patternset>\r
+                               <include name="**/*.o" />\r
+                       </patternset>\r
+               </fileset>\r
+               <pathconvert pathsep=" " property="objFiles" refid="objFileSet" />\r
+               <mkdir dir="${libsDir}" />\r
+               <exec executable="${iphonesimulator-platform}/${linker}" failonerror="true" dir="${buildDir}">\r
+                       <arg line="${linker-opts}" />\r
+                       <arg path="${libsDir}/${libName}.386" />\r
+                       <arg line="${objFiles}"/>\r
+                       <arg line="${libraries}" />\r
+               </exec>\r
+       </target>\r
+       \r
+       <!-- compiles all C and C++ files to object files in the build directory, for 386 builds-->\r
+       <target name="compile-arm" depends="create-build-dir,clean-objfiles">\r
+               <mkdir dir="${buildDir}"/>\r
+               <apply failonerror="true" executable="${iphoneos-platform}/${g++}" dest="${buildDir}" verbose="true">\r
+                       <arg line="-isysroot ${iphoneos-sdk} -arch armv7 ${g++-opts}"/>\r
+                       <arg value="-Ijni-headers"/>\r
+                       <arg value="-Ijni-headers/${jniPlatform}"/>\r
+                       <arg value="-I."/>\r
+                                               <arg value="-Isrc/"/>
+\r
+                       <srcfile/>\r
+                       <arg value="-o"/>\r
+                       <targetfile/>\r
+                       <fileset refid="g++-files"/>\r
+                       <compositemapper>\r
+                               <mapper type="glob" from="*.cpp" to="*.o"/>\r
+                               <mapper type="glob" from="*.mm" to="*.o"/>\r
+                       </compositemapper>\r
+               </apply>\r
+               <apply failonerror="true" executable="${iphoneos-platform}/${gcc}" dest="${buildDir}" verbose="true">\r
+                       <arg line="-isysroot ${iphoneos-sdk} -arch armv7 ${gcc-opts}"/>\r
+                       <arg value="-Ijni-headers"/>\r
+                       <arg value="-Ijni-headers/${jniPlatform}"/>\r
+                       <arg value="-I."/>\r
+                                               <arg value="-Isrc/"/>
+\r
+                       <srcfile/>\r
+                       <arg value="-o"/>\r
+                       <targetfile/>\r
+                       <fileset refid="gcc-files"/>\r
+                       <compositemapper>\r
+                               <mapper type="glob" from="*.c" to="*.o"/>\r
+                       </compositemapper>\r
+               </apply>\r
+       </target>       \r
+\r
+       <!-- links the shared library based on the previously compiled object files -->\r
+       <target name="link-arm" depends="compile-arm">\r
+               <fileset dir="${buildDir}" id="objFileSet">\r
+                       <patternset>\r
+                               <include name="**/*.o" />\r
+                       </patternset>\r
+               </fileset>\r
+               <pathconvert pathsep=" " property="objFiles" refid="objFileSet" />\r
+               <mkdir dir="${libsDir}" />\r
+               <exec executable="${iphoneos-platform}/${linker}" failonerror="true" dir="${buildDir}">\r
+                       <arg line="${linker-opts}" />\r
+                       <arg path="${libsDir}/${libName}.armv7" />\r
+                       <arg line="${objFiles}"/>\r
+                       <arg line="${libraries}" />\r
+               </exec>\r
+       </target>\r
+\r
+       <target name="link-fat">\r
+               <exec executable="lipo" failonerror="true" dir="${libsDir}">\r
+                       <arg line="-create -output ${libName} ${libName}.386 ${libName}.armv7"/>\r
+               </exec>\r
+       </target>\r
+\r
+       <target name="postcompile" depends="link-386,link-arm,link-fat">\r
+               \r
+       </target>\r
+</project>\r

diff --git a/extensions/gdx-bullet/jni/build-linux32.xml b/extensions/gdx-bullet/jni/build-linux32.xml
index c1599cd..32c7a53 100644 (file)
--- a/extensions/gdx-bullet/jni/build-linux32.xml
+++ b/extensions/gdx-bullet/jni/build-linux32.xml
@@ -17,7 +17,8 @@
        <property name="gcc-opts" value="-c -Wall -O2 -mfpmath=sse -msse -fmessage-length=0 -m32 -fPIC"/>\r
        <fileset id="gcc-files" dir="./">\r
                <exclude name="target/"/>               \r
-                               <include name="**/*.c"/>
+                               <include name="memcpy_wrap.c"/>
+               <include name="**/*.c"/>
 \r
                                <exclude name="src/BulletMultiThreaded/GpuSoftBodySolvers/**"/>
 \r
@@ -37,6 +38,7 @@
        <!-- define linker and options -->\r
        <property name="linker" value="${compilerPrefix}g++"/>\r
        <property name="linker-opts" value="-shared -m32"/>\r
+       <property name="libraries" value=""/>\r
        \r
        <!-- cleans the build directory, removes all object files and shared libs -->\r
        <target name="clean">\r
@@ -95,9 +97,10 @@
                        <arg value="-o"/>\r
                        <targetfile/>\r
                        <fileset refid="g++-files"/>\r
-                       <chainedmapper>\r
+                       <compositemapper>\r
                                <mapper type="glob" from="*.cpp" to="*.o"/>\r
-                       </chainedmapper>\r
+                               <mapper type="glob" from="*.mm" to="*.o"/>\r
+                       </compositemapper>\r
                </apply>\r
                <apply failonerror="true" executable="${gcc}" dest="${buildDir}" verbose="true">\r
                        <arg line="${gcc-opts}"/>\r
@@ -110,25 +113,28 @@
                        <arg value="-o"/>\r
                        <targetfile/>\r
                        <fileset refid="gcc-files"/>\r
-                       <chainedmapper>\r
+                       <compositemapper>\r
                                <mapper type="glob" from="*.c" to="*.o"/>\r
-                       </chainedmapper>\r
+                       </compositemapper>\r
                </apply>\r
        </target>       \r
 \r
        <!-- links the shared library based on the previously compiled object files --> \r
        <target name="link" depends="compile" if="has-compiler">\r
-               <mkdir dir="${libsDir}"/>\r
-               <apply failonerror="true" executable="${linker}" parallel="true" dir="${buildDir}">\r
-                       <arg line="${linker-opts}"/>\r
-                       <arg value="-o"/>\r
-                       <arg path="${libsDir}/${libName}"/>             \r
-                       <fileset dir="${buildDir}">\r
-                               <patternset>\r
-                                       <include name="**/*.o"/>\r
-                               </patternset>\r
-                       </fileset>\r
-               </apply>\r
+               <fileset dir="${buildDir}" id="objFileSet">\r
+                       <patternset>\r
+                               <include name="**/*.o" />\r
+                       </patternset>\r
+               </fileset>\r
+               <pathconvert pathsep=" " property="objFiles" refid="objFileSet" />\r
+               <mkdir dir="${libsDir}" />\r
+               <exec executable="${linker}" failonerror="true" dir="${buildDir}">\r
+                       <arg line="${linker-opts}" />\r
+                       <arg value="-o" />\r
+                       <arg path="${libsDir}/${libName}" />\r
+                       <arg line="${objFiles}"/>\r
+                       <arg line="${libraries}" />\r
+               </exec>\r
        </target>       \r
        \r
        <target name="postcompile" depends="link">\r

diff --git a/extensions/gdx-bullet/jni/build-linux64.xml b/extensions/gdx-bullet/jni/build-linux64.xml
index cb5ade9..6e43e9e 100644 (file)
--- a/extensions/gdx-bullet/jni/build-linux64.xml
+++ b/extensions/gdx-bullet/jni/build-linux64.xml
@@ -17,7 +17,8 @@
        <property name="gcc-opts" value="-c -Wall -O2 -mfpmath=sse -msse -fmessage-length=0 -m64 -fPIC"/>\r
        <fileset id="gcc-files" dir="./">\r
                <exclude name="target/"/>               \r
-                               <include name="**/*.c"/>
+                               <include name="memcpy_wrap.c"/>
+               <include name="**/*.c"/>
 \r
                                <exclude name="src/BulletMultiThreaded/GpuSoftBodySolvers/**"/>
 \r
@@ -37,6 +38,7 @@
        <!-- define linker and options -->\r
        <property name="linker" value="${compilerPrefix}g++"/>\r
        <property name="linker-opts" value="-shared -m64 -Wl,-wrap,memcpy"/>\r
+       <property name="libraries" value=""/>\r
        \r
        <!-- cleans the build directory, removes all object files and shared libs -->\r
        <target name="clean">\r
@@ -95,9 +97,10 @@
                        <arg value="-o"/>\r
                        <targetfile/>\r
                        <fileset refid="g++-files"/>\r
-                       <chainedmapper>\r
+                       <compositemapper>\r
                                <mapper type="glob" from="*.cpp" to="*.o"/>\r
-                       </chainedmapper>\r
+                               <mapper type="glob" from="*.mm" to="*.o"/>\r
+                       </compositemapper>\r
                </apply>\r
                <apply failonerror="true" executable="${gcc}" dest="${buildDir}" verbose="true">\r
                        <arg line="${gcc-opts}"/>\r
@@ -110,25 +113,28 @@
                        <arg value="-o"/>\r
                        <targetfile/>\r
                        <fileset refid="gcc-files"/>\r
-                       <chainedmapper>\r
+                       <compositemapper>\r
                                <mapper type="glob" from="*.c" to="*.o"/>\r
-                       </chainedmapper>\r
+                       </compositemapper>\r
                </apply>\r
        </target>       \r
 \r
        <!-- links the shared library based on the previously compiled object files --> \r
        <target name="link" depends="compile" if="has-compiler">\r
-               <mkdir dir="${libsDir}"/>\r
-               <apply failonerror="true" executable="${linker}" parallel="true" dir="${buildDir}">\r
-                       <arg line="${linker-opts}"/>\r
-                       <arg value="-o"/>\r
-                       <arg path="${libsDir}/${libName}"/>             \r
-                       <fileset dir="${buildDir}">\r
-                               <patternset>\r
-                                       <include name="**/*.o"/>\r
-                               </patternset>\r
-                       </fileset>\r
-               </apply>\r
+               <fileset dir="${buildDir}" id="objFileSet">\r
+                       <patternset>\r
+                               <include name="**/*.o" />\r
+                       </patternset>\r
+               </fileset>\r
+               <pathconvert pathsep=" " property="objFiles" refid="objFileSet" />\r
+               <mkdir dir="${libsDir}" />\r
+               <exec executable="${linker}" failonerror="true" dir="${buildDir}">\r
+                       <arg line="${linker-opts}" />\r
+                       <arg value="-o" />\r
+                       <arg path="${libsDir}/${libName}" />\r
+                       <arg line="${objFiles}"/>\r
+                       <arg line="${libraries}" />\r
+               </exec>\r
        </target>       \r
        \r
        <target name="postcompile" depends="link">\r

diff --git a/extensions/gdx-bullet/jni/build-macosx32.xml b/extensions/gdx-bullet/jni/build-macosx32.xml
index c3743d8..c4a6ce3 100644 (file)
--- a/extensions/gdx-bullet/jni/build-macosx32.xml
+++ b/extensions/gdx-bullet/jni/build-macosx32.xml
@@ -17,7 +17,8 @@
        <property name="gcc-opts" value="-c -Wall -O2 -arch i386 -arch x86_64 -DFIXED_POINT -fmessage-length=0 -fPIC -mmacosx-version-min=10.5"/>\r
        <fileset id="gcc-files" dir="./">\r
                <exclude name="target/"/>               \r
-                               <include name="**/*.c"/>
+                               <include name="memcpy_wrap.c"/>
+               <include name="**/*.c"/>
 \r
                                <exclude name="src/BulletMultiThreaded/GpuSoftBodySolvers/**"/>
 \r
@@ -37,6 +38,7 @@
        <!-- define linker and options -->\r
        <property name="linker" value="${compilerPrefix}g++"/>\r
        <property name="linker-opts" value="-shared -arch i386 -arch x86_64 -mmacosx-version-min=10.5"/>\r
+       <property name="libraries" value=""/>\r
        \r
        <!-- cleans the build directory, removes all object files and shared libs -->\r
        <target name="clean">\r
@@ -95,9 +97,10 @@
                        <arg value="-o"/>\r
                        <targetfile/>\r
                        <fileset refid="g++-files"/>\r
-                       <chainedmapper>\r
+                       <compositemapper>\r
                                <mapper type="glob" from="*.cpp" to="*.o"/>\r
-                       </chainedmapper>\r
+                               <mapper type="glob" from="*.mm" to="*.o"/>\r
+                       </compositemapper>\r
                </apply>\r
                <apply failonerror="true" executable="${gcc}" dest="${buildDir}" verbose="true">\r
                        <arg line="${gcc-opts}"/>\r
@@ -110,25 +113,28 @@
                        <arg value="-o"/>\r
                        <targetfile/>\r
                        <fileset refid="gcc-files"/>\r
-                       <chainedmapper>\r
+                       <compositemapper>\r
                                <mapper type="glob" from="*.c" to="*.o"/>\r
-                       </chainedmapper>\r
+                       </compositemapper>\r
                </apply>\r
        </target>       \r
 \r
        <!-- links the shared library based on the previously compiled object files --> \r
        <target name="link" depends="compile" if="has-compiler">\r
-               <mkdir dir="${libsDir}"/>\r
-               <apply failonerror="true" executable="${linker}" parallel="true" dir="${buildDir}">\r
-                       <arg line="${linker-opts}"/>\r
-                       <arg value="-o"/>\r
-                       <arg path="${libsDir}/${libName}"/>             \r
-                       <fileset dir="${buildDir}">\r
-                               <patternset>\r
-                                       <include name="**/*.o"/>\r
-                               </patternset>\r
-                       </fileset>\r
-               </apply>\r
+               <fileset dir="${buildDir}" id="objFileSet">\r
+                       <patternset>\r
+                               <include name="**/*.o" />\r
+                       </patternset>\r
+               </fileset>\r
+               <pathconvert pathsep=" " property="objFiles" refid="objFileSet" />\r
+               <mkdir dir="${libsDir}" />\r
+               <exec executable="${linker}" failonerror="true" dir="${buildDir}">\r
+                       <arg line="${linker-opts}" />\r
+                       <arg value="-o" />\r
+                       <arg path="${libsDir}/${libName}" />\r
+                       <arg line="${objFiles}"/>\r
+                       <arg line="${libraries}" />\r
+               </exec>\r
        </target>       \r
        \r
        <target name="postcompile" depends="link">\r

diff --git a/extensions/gdx-bullet/jni/build-windows32.xml b/extensions/gdx-bullet/jni/build-windows32.xml
index c03d783..b8fd3c3 100644 (file)
--- a/extensions/gdx-bullet/jni/build-windows32.xml
+++ b/extensions/gdx-bullet/jni/build-windows32.xml
@@ -17,7 +17,8 @@
        <property name="gcc-opts" value="-c -Wall -O2 -mfpmath=sse -msse2 -fmessage-length=0 -m32"/>\r
        <fileset id="gcc-files" dir="./">\r
                <exclude name="target/"/>               \r
-                               <include name="**/*.c"/>
+                               <include name="memcpy_wrap.c"/>
+               <include name="**/*.c"/>
 \r
                                <exclude name="src/BulletMultiThreaded/GpuSoftBodySolvers/**"/>
 \r
@@ -37,6 +38,7 @@
        <!-- define linker and options -->\r
        <property name="linker" value="${compilerPrefix}g++"/>\r
        <property name="linker-opts" value="-Wl,--kill-at -shared -m32 -static-libgcc -static-libstdc++"/>\r
+       <property name="libraries" value=""/>\r
        \r
        <!-- cleans the build directory, removes all object files and shared libs -->\r
        <target name="clean">\r
@@ -95,9 +97,10 @@
                        <arg value="-o"/>\r
                        <targetfile/>\r
                        <fileset refid="g++-files"/>\r
-                       <chainedmapper>\r
+                       <compositemapper>\r
                                <mapper type="glob" from="*.cpp" to="*.o"/>\r
-                       </chainedmapper>\r
+                               <mapper type="glob" from="*.mm" to="*.o"/>\r
+                       </compositemapper>\r
                </apply>\r
                <apply failonerror="true" executable="${gcc}" dest="${buildDir}" verbose="true">\r
                        <arg line="${gcc-opts}"/>\r
@@ -110,25 +113,28 @@
                        <arg value="-o"/>\r
                        <targetfile/>\r
                        <fileset refid="gcc-files"/>\r
-                       <chainedmapper>\r
+                       <compositemapper>\r
                                <mapper type="glob" from="*.c" to="*.o"/>\r
-                       </chainedmapper>\r
+                       </compositemapper>\r
                </apply>\r
        </target>       \r
 \r
        <!-- links the shared library based on the previously compiled object files --> \r
        <target name="link" depends="compile" if="has-compiler">\r
-               <mkdir dir="${libsDir}"/>\r
-               <apply failonerror="true" executable="${linker}" parallel="true" dir="${buildDir}">\r
-                       <arg line="${linker-opts}"/>\r
-                       <arg value="-o"/>\r
-                       <arg path="${libsDir}/${libName}"/>             \r
-                       <fileset dir="${buildDir}">\r
-                               <patternset>\r
-                                       <include name="**/*.o"/>\r
-                               </patternset>\r
-                       </fileset>\r
-               </apply>\r
+               <fileset dir="${buildDir}" id="objFileSet">\r
+                       <patternset>\r
+                               <include name="**/*.o" />\r
+                       </patternset>\r
+               </fileset>\r
+               <pathconvert pathsep=" " property="objFiles" refid="objFileSet" />\r
+               <mkdir dir="${libsDir}" />\r
+               <exec executable="${linker}" failonerror="true" dir="${buildDir}">\r
+                       <arg line="${linker-opts}" />\r
+                       <arg value="-o" />\r
+                       <arg path="${libsDir}/${libName}" />\r
+                       <arg line="${objFiles}"/>\r
+                       <arg line="${libraries}" />\r
+               </exec>\r
        </target>       \r
        \r
        <target name="postcompile" depends="link">\r

diff --git a/extensions/gdx-bullet/jni/build-windows32home.xml b/extensions/gdx-bullet/jni/build-windows32home.xml
index dae7c70..f4fc627 100644 (file)
--- a/extensions/gdx-bullet/jni/build-windows32home.xml
+++ b/extensions/gdx-bullet/jni/build-windows32home.xml
@@ -17,7 +17,8 @@
        <property name="gcc-opts" value="-c -Wall -O2 -mfpmath=sse -msse2 -fmessage-length=0 -m32"/>\r
        <fileset id="gcc-files" dir="./">\r
                <exclude name="target/"/>               \r
-                               <include name="**/*.c"/>
+                               <include name="memcpy_wrap.c"/>
+               <include name="**/*.c"/>
 \r
                                <exclude name="src/BulletMultiThreaded/GpuSoftBodySolvers/**"/>
 \r
@@ -37,6 +38,7 @@
        <!-- define linker and options -->\r
        <property name="linker" value="${compilerPrefix}g++"/>\r
        <property name="linker-opts" value="-Wl,--kill-at -shared -m32 -static-libgcc -static-libstdc++"/>\r
+       <property name="libraries" value=""/>\r
        \r
        <!-- cleans the build directory, removes all object files and shared libs -->\r
        <target name="clean">\r
@@ -95,9 +97,10 @@
                        <arg value="-o"/>\r
                        <targetfile/>\r
                        <fileset refid="g++-files"/>\r
-                       <chainedmapper>\r
+                       <compositemapper>\r
                                <mapper type="glob" from="*.cpp" to="*.o"/>\r
-                       </chainedmapper>\r
+                               <mapper type="glob" from="*.mm" to="*.o"/>\r
+                       </compositemapper>\r
                </apply>\r
                <apply failonerror="true" executable="${gcc}" dest="${buildDir}" verbose="true">\r
                        <arg line="${gcc-opts}"/>\r
@@ -110,25 +113,28 @@
                        <arg value="-o"/>\r
                        <targetfile/>\r
                        <fileset refid="gcc-files"/>\r
-                       <chainedmapper>\r
+                       <compositemapper>\r
                                <mapper type="glob" from="*.c" to="*.o"/>\r
-                       </chainedmapper>\r
+                       </compositemapper>\r
                </apply>\r
        </target>       \r
 \r
        <!-- links the shared library based on the previously compiled object files --> \r
        <target name="link" depends="compile" if="has-compiler">\r
-               <mkdir dir="${libsDir}"/>\r
-               <apply failonerror="true" executable="${linker}" parallel="true" dir="${buildDir}">\r
-                       <arg line="${linker-opts}"/>\r
-                       <arg value="-o"/>\r
-                       <arg path="${libsDir}/${libName}"/>             \r
-                       <fileset dir="${buildDir}">\r
-                               <patternset>\r
-                                       <include name="**/*.o"/>\r
-                               </patternset>\r
-                       </fileset>\r
-               </apply>\r
+               <fileset dir="${buildDir}" id="objFileSet">\r
+                       <patternset>\r
+                               <include name="**/*.o" />\r
+                       </patternset>\r
+               </fileset>\r
+               <pathconvert pathsep=" " property="objFiles" refid="objFileSet" />\r
+               <mkdir dir="${libsDir}" />\r
+               <exec executable="${linker}" failonerror="true" dir="${buildDir}">\r
+                       <arg line="${linker-opts}" />\r
+                       <arg value="-o" />\r
+                       <arg path="${libsDir}/${libName}" />\r
+                       <arg line="${objFiles}"/>\r
+                       <arg line="${libraries}" />\r
+               </exec>\r
        </target>       \r
        \r
        <target name="postcompile" depends="link">\r

diff --git a/extensions/gdx-bullet/jni/build-windows64.xml b/extensions/gdx-bullet/jni/build-windows64.xml
index eb2e2fb..9d5534e 100644 (file)
--- a/extensions/gdx-bullet/jni/build-windows64.xml
+++ b/extensions/gdx-bullet/jni/build-windows64.xml
@@ -17,7 +17,8 @@
        <property name="gcc-opts" value="-c -Wall -O2 -mfpmath=sse -msse2 -fmessage-length=0 -m64"/>\r
        <fileset id="gcc-files" dir="./">\r
                <exclude name="target/"/>               \r
-                               <include name="**/*.c"/>
+                               <include name="memcpy_wrap.c"/>
+               <include name="**/*.c"/>
 \r
                                <exclude name="src/BulletMultiThreaded/GpuSoftBodySolvers/**"/>
 \r
@@ -37,6 +38,7 @@
        <!-- define linker and options -->\r
        <property name="linker" value="${compilerPrefix}g++"/>\r
        <property name="linker-opts" value="-Wl,--kill-at -shared -static-libgcc -static-libstdc++ -m64"/>\r
+       <property name="libraries" value=""/>\r
        \r
        <!-- cleans the build directory, removes all object files and shared libs -->\r
        <target name="clean">\r
@@ -95,9 +97,10 @@
                        <arg value="-o"/>\r
                        <targetfile/>\r
                        <fileset refid="g++-files"/>\r
-                       <chainedmapper>\r
+                       <compositemapper>\r
                                <mapper type="glob" from="*.cpp" to="*.o"/>\r
-                       </chainedmapper>\r
+                               <mapper type="glob" from="*.mm" to="*.o"/>\r
+                       </compositemapper>\r
                </apply>\r
                <apply failonerror="true" executable="${gcc}" dest="${buildDir}" verbose="true">\r
                        <arg line="${gcc-opts}"/>\r
@@ -110,25 +113,28 @@
                        <arg value="-o"/>\r
                        <targetfile/>\r
                        <fileset refid="gcc-files"/>\r
-                       <chainedmapper>\r
+                       <compositemapper>\r
                                <mapper type="glob" from="*.c" to="*.o"/>\r
-                       </chainedmapper>\r
+                       </compositemapper>\r
                </apply>\r
        </target>       \r
 \r
        <!-- links the shared library based on the previously compiled object files --> \r
        <target name="link" depends="compile" if="has-compiler">\r
-               <mkdir dir="${libsDir}"/>\r
-               <apply failonerror="true" executable="${linker}" parallel="true" dir="${buildDir}">\r
-                       <arg line="${linker-opts}"/>\r
-                       <arg value="-o"/>\r
-                       <arg path="${libsDir}/${libName}"/>             \r
-                       <fileset dir="${buildDir}">\r
-                               <patternset>\r
-                                       <include name="**/*.o"/>\r
-                               </patternset>\r
-                       </fileset>\r
-               </apply>\r
+               <fileset dir="${buildDir}" id="objFileSet">\r
+                       <patternset>\r
+                               <include name="**/*.o" />\r
+                       </patternset>\r
+               </fileset>\r
+               <pathconvert pathsep=" " property="objFiles" refid="objFileSet" />\r
+               <mkdir dir="${libsDir}" />\r
+               <exec executable="${linker}" failonerror="true" dir="${buildDir}">\r
+                       <arg line="${linker-opts}" />\r
+                       <arg value="-o" />\r
+                       <arg path="${libsDir}/${libName}" />\r
+                       <arg line="${objFiles}"/>\r
+                       <arg line="${libraries}" />\r
+               </exec>\r
        </target>       \r
        \r
        <target name="postcompile" depends="link">\r

diff --git a/extensions/gdx-bullet/jni/build.xml b/extensions/gdx-bullet/jni/build.xml
index 8b1bfa0..da65248 100644 (file)
--- a/extensions/gdx-bullet/jni/build.xml
+++ b/extensions/gdx-bullet/jni/build.xml
@@ -25,6 +25,7 @@
                        <fileset dir="../libs/linux64" includes="libgdx-bullet64.so"/>
                        <fileset dir="../libs/macosx32" includes="libgdx-bullet.dylib"/>
                        <fileset dir="../libs/android32" includes="libgdx-bullet.so"/>
+                       <fileset dir="../libs/ios32" includes="libgdx-bullet.a"/>
 
                </jar>
        </target>

diff --git a/extensions/gdx-bullet/src/com/badlogic/gdx/physics/bullet/BulletBuild.java b/extensions/gdx-bullet/src/com/badlogic/gdx/physics/bullet/BulletBuild.java
index 94cc3c0..d36f927 100644 (file)
--- a/extensions/gdx-bullet/src/com/badlogic/gdx/physics/bullet/BulletBuild.java
+++ b/extensions/gdx-bullet/src/com/badlogic/gdx/physics/bullet/BulletBuild.java
@@ -89,8 +89,13 @@ public class BulletBuild {
                android.cExcludes = android.cppExcludes = excludes;\r
                android.headerDirs = headers;\r
                android.cppFlags += cppFlags;\r
+               \r
+               BuildTarget ios = BuildTarget.newDefaultTarget(TargetOs.IOS, false);\r
+               ios.cExcludes = ios.cppExcludes = excludes;\r
+               ios.headerDirs = headers;\r
+               ios.cppFlags += cppFlags;\r
 \r
-               new AntScriptGenerator().generate(new BuildConfig("gdx-bullet"), win32home, win32, win64, lin32, lin64, mac, android);\r
+               new AntScriptGenerator().generate(new BuildConfig("gdx-bullet"), win32home, win32, win64, lin32, lin64, mac, android, ios);\r
 \r
                // build natives\r
                // BuildExecutor.executeAnt("jni/build-windows32home.xml", "-v");\r