OSDN Git Service

[fixed] bullet wrapper uses jnigen now :D
authorbadlogicgames <badlogicgames@6c4fd544-2939-11df-bb46-9574ba5d0bfa>
Mon, 26 Dec 2011 02:39:05 +0000 (02:39 +0000)
committerbadlogicgames <badlogicgames@6c4fd544-2939-11df-bb46-9574ba5d0bfa>
Mon, 26 Dec 2011 02:39:05 +0000 (02:39 +0000)
23 files changed:
extensions/bullet/bullet/AndroidManifest.xml
extensions/bullet/bullet/jni/Android.mk
extensions/bullet/bullet/jni/Application.mk
extensions/bullet/bullet/jni/build-android.xml [deleted file]
extensions/bullet/bullet/jni/build-android32.xml [new file with mode: 0644]
extensions/bullet/bullet/jni/build-lin32.xml [deleted file]
extensions/bullet/bullet/jni/build-lin64.xml [deleted file]
extensions/bullet/bullet/jni/build-linux32.xml [new file with mode: 0644]
extensions/bullet/bullet/jni/build-linux64.xml [new file with mode: 0644]
extensions/bullet/bullet/jni/build-macos.xml [deleted file]
extensions/bullet/bullet/jni/build-macosx32.xml [new file with mode: 0644]
extensions/bullet/bullet/jni/build-win32.xml [deleted file]
extensions/bullet/bullet/jni/build-win32home.xml [deleted file]
extensions/bullet/bullet/jni/build-win64.xml [deleted file]
extensions/bullet/bullet/jni/build-win64home.xml [deleted file]
extensions/bullet/bullet/jni/build-windows32.xml [new file with mode: 0644]
extensions/bullet/bullet/jni/build-windows32home.xml [new file with mode: 0644]
extensions/bullet/bullet/jni/build-windows64.xml [new file with mode: 0644]
extensions/bullet/bullet/jni/build.xml
extensions/bullet/bullet/libs/windows32/bullet.dll [new file with mode: 0644]
extensions/bullet/bullet/src/com/badlogic/gdx/physics/bullet/BulletBuild.java
extensions/jnigen/src/com/badlogic/gdx/jnigen/AndroidNdkScriptGenerator.java
extensions/jnigen/src/com/badlogic/gdx/jnigen/AntScriptGenerator.java

index 28424b6..e69de29 100644 (file)
@@ -1,15 +0,0 @@
-<!--\r
-  Copyright 2011 See AUTHORS file.\r
-  \r
-  Licensed under the Apache License, Version 2.0 (the "License");\r
-  you may not use this file except in compliance with the License.\r
-  You may obtain a copy of the License at\r
-  \r
-    http://www.apache.org/licenses/LICENSE-2.0\r
-  \r
-  Unless required by applicable law or agreed to in writing, software\r
-  distributed under the License is distributed on an "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-  See the License for the specific language governing permissions and\r
-  limitations under the License.\r
--->\r
index 575dc06..7b07701 100644 (file)
-LOCAL_PATH:= $(call my-dir)
-BULLET_PATH:= src
-include $(CLEAR_VARS)
-LOCAL_MODULE    := bullet
-LOCAL_C_INCLUDES := $(BULLET_PATH)/\
-    $(BULLET_PATH)/BulletCollision/BroadphaseCollision\
-    $(BULLET_PATH)/BulletCollision/CollisionDispatch\
-    $(BULLET_PATH)/BulletCollision/CollisionShapes\
-    $(BULLET_PATH)/BulletCollision/NarrowPhaseCollision\
-    $(BULLET_PATH)/BulletDynamics/ConstraintSolver\
-    $(BULLET_PATH)/BulletDynamics/Dynamics\
-    $(BULLET_PATH)/BulletDynamics/Vehicle\
-    $(BULLET_PATH)/LinearMath\
-    $(BULLET_PATH)/BulletCollision\
-    $(BULLET_PATH)/BulletDynamics\
-    $(BULLET_PATH)/BulletMultiThreaded\
-    $(BULLET_PATH)/BulletSoftBody\
-    $(BULLET_PATH)/ibmsdk\
-    $(BULLET_PATH)/LinearMath\
-    $(BULLET_PATH)/MiniCL\
-    $(BULLET_PATH)/vectormath\
-    $(BULLET_PATH)/BulletCollision/BroadphaseCollision\
-    $(BULLET_PATH)/BulletCollision/CollisionDispatch\
-    $(BULLET_PATH)/BulletCollision/CollisionShapes\
-    $(BULLET_PATH)/BulletCollision/Gimpact\
-    $(BULLET_PATH)/BulletCollision/ibmsdk\
-    $(BULLET_PATH)/BulletCollision/NarrowPhaseCollision\
-    $(BULLET_PATH)/BulletDynamics/Character\
-    $(BULLET_PATH)/BulletDynamics/ConstraintSolver\
-    $(BULLET_PATH)/BulletDynamics/Dynamics\
-    $(BULLET_PATH)/BulletDynamics/ibmsdk\
-    $(BULLET_PATH)/BulletDynamics/Vehicle\
-    $(BULLET_PATH)/BulletMultiThreaded/GpuSoftBodySolvers\
-    $(BULLET_PATH)/BulletMultiThreaded/out\
-    $(BULLET_PATH)/BulletMultiThreaded/SpuNarrowPhaseCollisionTask\
-    $(BULLET_PATH)/BulletMultiThreaded/SpuSampleTask\
-    $(BULLET_PATH)/BulletMultiThreaded/GpuSoftBodySolvers/CPU\
-    $(BULLET_PATH)/BulletMultiThreaded/GpuSoftBodySolvers/DX11\
-    $(BULLET_PATH)/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL\
-    $(BULLET_PATH)/BulletMultiThreaded/GpuSoftBodySolvers/DX11/HLSL\
-    $(BULLET_PATH)/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/AMD\
-    $(BULLET_PATH)/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/Apple\
-    $(BULLET_PATH)/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/MiniCL\
-    $(BULLET_PATH)/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/NVidia\
-    $(BULLET_PATH)/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/OpenCLC\
-    $(BULLET_PATH)/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/OpenCLC10\
-    $(BULLET_PATH)/LinearMath/ibmsdk\
-    $(BULLET_PATH)/MiniCL/MiniCLTask\
-    $(BULLET_PATH)/vectormath/scalar\
-    $(BULLET_PATH)/vectormath/sse
-LOCAL_CFLAGS := $(LOCAL_C_INCLUDES:%=-I%) -O2 -Wall -D__ANDROID__
-LOCAL_LDLIBS := -ldl -lm -llog
-LOCAL_ARM_MODE  := arm
-LOCAL_SRC_FILES := $(BULLET_PATH)/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp\
-    $(BULLET_PATH)/BulletCollision/BroadphaseCollision/btBroadphaseProxy.cpp\
-    $(BULLET_PATH)/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.cpp\
-    $(BULLET_PATH)/BulletCollision/BroadphaseCollision/btDbvt.cpp\
-    $(BULLET_PATH)/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp\
-    $(BULLET_PATH)/BulletCollision/BroadphaseCollision/btDispatcher.cpp\
-    $(BULLET_PATH)/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.cpp\
-    $(BULLET_PATH)/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp\
-    $(BULLET_PATH)/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp\
-    $(BULLET_PATH)/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp\
-    $(BULLET_PATH)/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.cpp\
-    $(BULLET_PATH)/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.cpp\
-    $(BULLET_PATH)/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp\
-    $(BULLET_PATH)/BulletCollision/CollisionDispatch/btBoxBoxDetector.cpp\
-    $(BULLET_PATH)/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp\
-    $(BULLET_PATH)/BulletCollision/CollisionDispatch/btCollisionObject.cpp\
-    $(BULLET_PATH)/BulletCollision/CollisionDispatch/btCollisionWorld.cpp\
-    $(BULLET_PATH)/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp\
-    $(BULLET_PATH)/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.cpp\
-    $(BULLET_PATH)/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp\
-    $(BULLET_PATH)/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp\
-    $(BULLET_PATH)/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp\
-    $(BULLET_PATH)/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp\
-    $(BULLET_PATH)/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.cpp\
-    $(BULLET_PATH)/BulletCollision/CollisionDispatch/btGhostObject.cpp\
-    $(BULLET_PATH)/BulletCollision/CollisionDispatch/btInternalEdgeUtility.cpp\
-    $(BULLET_PATH)/BulletCollision/CollisionDispatch/btManifoldResult.cpp\
-    $(BULLET_PATH)/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp\
-    $(BULLET_PATH)/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp\
-    $(BULLET_PATH)/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp\
-    $(BULLET_PATH)/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp\
-    $(BULLET_PATH)/BulletCollision/CollisionDispatch/btUnionFind.cpp\
-    $(BULLET_PATH)/BulletCollision/CollisionDispatch/SphereTriangleDetector.cpp\
-    $(BULLET_PATH)/BulletCollision/CollisionShapes/btBox2dShape.cpp\
-    $(BULLET_PATH)/BulletCollision/CollisionShapes/btBoxShape.cpp\
-    $(BULLET_PATH)/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp\
-    $(BULLET_PATH)/BulletCollision/CollisionShapes/btCapsuleShape.cpp\
-    $(BULLET_PATH)/BulletCollision/CollisionShapes/btCollisionShape.cpp\
-    $(BULLET_PATH)/BulletCollision/CollisionShapes/btCompoundShape.cpp\
-    $(BULLET_PATH)/BulletCollision/CollisionShapes/btConcaveShape.cpp\
-    $(BULLET_PATH)/BulletCollision/CollisionShapes/btConeShape.cpp\
-    $(BULLET_PATH)/BulletCollision/CollisionShapes/btConvex2dShape.cpp\
-    $(BULLET_PATH)/BulletCollision/CollisionShapes/btConvexHullShape.cpp\
-    $(BULLET_PATH)/BulletCollision/CollisionShapes/btConvexInternalShape.cpp\
-    $(BULLET_PATH)/BulletCollision/CollisionShapes/btConvexPointCloudShape.cpp\
-    $(BULLET_PATH)/BulletCollision/CollisionShapes/btConvexPolyhedron.cpp\
-    $(BULLET_PATH)/BulletCollision/CollisionShapes/btConvexShape.cpp\
-    $(BULLET_PATH)/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp\
-    $(BULLET_PATH)/BulletCollision/CollisionShapes/btCylinderShape.cpp\
-    $(BULLET_PATH)/BulletCollision/CollisionShapes/btEmptyShape.cpp\
-    $(BULLET_PATH)/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp\
-    $(BULLET_PATH)/BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp\
-    $(BULLET_PATH)/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.cpp\
-    $(BULLET_PATH)/BulletCollision/CollisionShapes/btMultiSphereShape.cpp\
-    $(BULLET_PATH)/BulletCollision/CollisionShapes/btOptimizedBvh.cpp\
-    $(BULLET_PATH)/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp\
-    $(BULLET_PATH)/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp\
-    $(BULLET_PATH)/BulletCollision/CollisionShapes/btShapeHull.cpp\
-    $(BULLET_PATH)/BulletCollision/CollisionShapes/btSphereShape.cpp\
-    $(BULLET_PATH)/BulletCollision/CollisionShapes/btStaticPlaneShape.cpp\
-    $(BULLET_PATH)/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp\
-    $(BULLET_PATH)/BulletCollision/CollisionShapes/btTetrahedronShape.cpp\
-    $(BULLET_PATH)/BulletCollision/CollisionShapes/btTriangleBuffer.cpp\
-    $(BULLET_PATH)/BulletCollision/CollisionShapes/btTriangleCallback.cpp\
-    $(BULLET_PATH)/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp\
-    $(BULLET_PATH)/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp\
-    $(BULLET_PATH)/BulletCollision/CollisionShapes/btTriangleMesh.cpp\
-    $(BULLET_PATH)/BulletCollision/CollisionShapes/btTriangleMeshShape.cpp\
-    $(BULLET_PATH)/BulletCollision/CollisionShapes/btUniformScalingShape.cpp\
-    $(BULLET_PATH)/BulletCollision/Gimpact/btContactProcessing.cpp\
-    $(BULLET_PATH)/BulletCollision/Gimpact/btGenericPoolAllocator.cpp\
-    $(BULLET_PATH)/BulletCollision/Gimpact/btGImpactBvh.cpp\
-    $(BULLET_PATH)/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.cpp\
-    $(BULLET_PATH)/BulletCollision/Gimpact/btGImpactQuantizedBvh.cpp\
-    $(BULLET_PATH)/BulletCollision/Gimpact/btGImpactShape.cpp\
-    $(BULLET_PATH)/BulletCollision/Gimpact/btTriangleShapeEx.cpp\
-    $(BULLET_PATH)/BulletCollision/Gimpact/gim_box_set.cpp\
-    $(BULLET_PATH)/BulletCollision/Gimpact/gim_contact.cpp\
-    $(BULLET_PATH)/BulletCollision/Gimpact/gim_memory.cpp\
-    $(BULLET_PATH)/BulletCollision/Gimpact/gim_tri_collision.cpp\
-    $(BULLET_PATH)/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp\
-    $(BULLET_PATH)/BulletCollision/NarrowPhaseCollision/btConvexCast.cpp\
-    $(BULLET_PATH)/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.cpp\
-    $(BULLET_PATH)/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp\
-    $(BULLET_PATH)/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp\
-    $(BULLET_PATH)/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp\
-    $(BULLET_PATH)/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp\
-    $(BULLET_PATH)/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp\
-    $(BULLET_PATH)/BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.cpp\
-    $(BULLET_PATH)/BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp\
-    $(BULLET_PATH)/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.cpp\
-    $(BULLET_PATH)/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp\
-    $(BULLET_PATH)/BulletDynamics/Character/btKinematicCharacterController.cpp\
-    $(BULLET_PATH)/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp\
-    $(BULLET_PATH)/BulletDynamics/ConstraintSolver/btContactConstraint.cpp\
-    $(BULLET_PATH)/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp\
-    $(BULLET_PATH)/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.cpp\
-    $(BULLET_PATH)/BulletDynamics/ConstraintSolver/btHinge2Constraint.cpp\
-    $(BULLET_PATH)/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp\
-    $(BULLET_PATH)/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp\
-    $(BULLET_PATH)/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp\
-    $(BULLET_PATH)/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp\
-    $(BULLET_PATH)/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.cpp\
-    $(BULLET_PATH)/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp\
-    $(BULLET_PATH)/BulletDynamics/ConstraintSolver/btUniversalConstraint.cpp\
-    $(BULLET_PATH)/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp\
-    $(BULLET_PATH)/BulletDynamics/Dynamics/btRigidBody.cpp\
-    $(BULLET_PATH)/BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp\
-    $(BULLET_PATH)/BulletDynamics/Dynamics/Bullet-C-API.cpp\
-    $(BULLET_PATH)/BulletDynamics/Vehicle/btRaycastVehicle.cpp\
-    $(BULLET_PATH)/BulletDynamics/Vehicle/btWheelInfo.cpp\
-    $(BULLET_PATH)/BulletMultiThreaded/btGpu3DGridBroadphase.cpp\
-    $(BULLET_PATH)/BulletMultiThreaded/btParallelConstraintSolver.cpp\
-    $(BULLET_PATH)/BulletMultiThreaded/btThreadSupportInterface.cpp\
-    $(BULLET_PATH)/BulletMultiThreaded/PosixThreadSupport.cpp\
-    $(BULLET_PATH)/BulletMultiThreaded/SequentialThreadSupport.cpp\
-    $(BULLET_PATH)/BulletMultiThreaded/SpuCollisionObjectWrapper.cpp\
-    $(BULLET_PATH)/BulletMultiThreaded/SpuCollisionTaskProcess.cpp\
-    $(BULLET_PATH)/BulletMultiThreaded/SpuContactManifoldCollisionAlgorithm.cpp\
-    $(BULLET_PATH)/BulletMultiThreaded/SpuFakeDma.cpp\
-    $(BULLET_PATH)/BulletMultiThreaded/SpuGatheringCollisionDispatcher.cpp\
-    $(BULLET_PATH)/BulletMultiThreaded/SpuLibspe2Support.cpp\
-    $(BULLET_PATH)/BulletMultiThreaded/SpuSampleTaskProcess.cpp\
-    $(BULLET_PATH)/BulletMultiThreaded/Win32ThreadSupport.cpp\
-    $(BULLET_PATH)/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/boxBoxDistance.cpp\
-    $(BULLET_PATH)/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuCollisionShapes.cpp\
-    $(BULLET_PATH)/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuContactResult.cpp\
-    $(BULLET_PATH)/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.cpp\
-    $(BULLET_PATH)/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuMinkowskiPenetrationDepthSolver.cpp\
-    $(BULLET_PATH)/BulletMultiThreaded/SpuSampleTask/SpuSampleTask.cpp\
-    $(BULLET_PATH)/BulletSoftBody/btDefaultSoftBodySolver.cpp\
-    $(BULLET_PATH)/BulletSoftBody/btSoftBody.cpp\
-    $(BULLET_PATH)/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.cpp\
-    $(BULLET_PATH)/BulletSoftBody/btSoftBodyHelpers.cpp\
-    $(BULLET_PATH)/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.cpp\
-    $(BULLET_PATH)/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp\
-    $(BULLET_PATH)/BulletSoftBody/btSoftRigidDynamicsWorld.cpp\
-    $(BULLET_PATH)/BulletSoftBody/btSoftSoftCollisionAlgorithm.cpp\
-    $(BULLET_PATH)/LinearMath/btAlignedAllocator.cpp\
-    $(BULLET_PATH)/LinearMath/btConvexHull.cpp\
-    $(BULLET_PATH)/LinearMath/btConvexHullComputer.cpp\
-    $(BULLET_PATH)/LinearMath/btGeometryUtil.cpp\
-    $(BULLET_PATH)/LinearMath/btQuickprof.cpp\
-    $(BULLET_PATH)/LinearMath/btSerializer.cpp\
-    $(BULLET_PATH)/MiniCL/MiniCL.cpp\
-    $(BULLET_PATH)/MiniCL/MiniCLTaskScheduler.cpp\
-    $(BULLET_PATH)/MiniCL/MiniCLTask/MiniCLTask.cpp
-include $(BUILD_SHARED_LIBRARY)
+LOCAL_PATH:= $(call my-dir)\r
+include $(CLEAR_VARS)\r
\r
+LOCAL_MODULE    := bullet\r
+LOCAL_C_INCLUDES := src/ \r
\r
+LOCAL_CFLAGS := $(LOCAL_C_INCLUDES:%=-I%) -O2 -Wall -D__ANDROID__\r
+LOCAL_CPPFLAGS := $(LOCAL_C_INCLUDES:%=-I%) -O2 -Wall -D__ANDROID__\r
+LOCAL_LDLIBS := -lm\r
+LOCAL_ARM_MODE  := arm\r
\r
+LOCAL_SRC_FILES := com.badlogic.gdx.physics.bullet.collision.BulletObject.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/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/btConeShape.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/btOptimizedBvh.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/btPersistentManifold.cpp\
+       src/BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.cpp\
+       src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp\
+       src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.cpp\
+       src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.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/GpuSoftBodySolvers/DX11/btSoftBodySolver_DX11.cpp\
+       src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/btSoftBodySolver_DX11SIMDAware.cpp\
+       src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/btSoftBodySolverOutputCLtoGL.cpp\
+       src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/btSoftBodySolver_OpenCL.cpp\
+       src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/btSoftBodySolver_OpenCLSIMDAware.cpp\
+       src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/MiniCL/MiniCLTaskWrap.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/MiniCL/MiniCL.cpp\
+       src/MiniCL/MiniCLTask/MiniCLTask.cpp\
+       src/MiniCL/MiniCLTaskScheduler.cpp
\r
+include $(BUILD_SHARED_LIBRARY)\r
index aa21d7d..d0a1e39 100644 (file)
@@ -1,2 +1 @@
-APP_MODULES      := bullet
-APP_ABI          := armeabi armeabi-v7a
\ No newline at end of file
+APP_ABI := armeabi armeabi-v7a
\ No newline at end of file
diff --git a/extensions/bullet/bullet/jni/build-android.xml b/extensions/bullet/bullet/jni/build-android.xml
deleted file mode 100644 (file)
index d78e729..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-<project name="bullet-natives" basedir="." default="compile-natives">
-       <property environment="env" />
-
-       <target name="clean">
-               <exec executable="${env.NDK_HOME}/ndk-build">
-                       <arg value="clean"/>
-               </exec>
-       </target>
-
-       <target name="compile-natives">
-               <echo>ndk_home: ${env.NDK_HOME}</echo>
-               <exec executable="${env.NDK_HOME}/ndk-build"/>
-       </target>
-       
-       <!-- updates the native libs of the android test suite -->
-       <target name="update-android-tests">
-               <!--<copy tofile="../../tests/gdx-tests-android/libs/armeabi/libgdx.so" file="../libs/armeabi/libgdx.so" />
-               <copy tofile="tests/gdx-tests-android/libs/armeabi/libmpg123.so" file="../libs/armeabi/libmpg123.so" />
-               <copy tofile="../../tests/gdx-tests-android/libs/armeabi/libandroidgl20.so" file="../dist/armeabi/libandroidgl20.so" />
-               <copy tofile="../../tests/gdx-tests-android/libs/armeabi-v7a/libgdx.so" file="../libs/armeabi-v7a/libgdx.so" />
-               <copy tofile="tests/gdx-tests-android/libs/armeabi-v7a/libmpg123.so" file="../libs/armeabi-v7a/libmpg123.so" />
-               <copy tofile="../../tests/gdx-tests-android/libs/armeabi-v7a/libandroidgl20.so" file="../dist/armeabi/libandroidgl20.so" />-->
-       </target>
-</project>
diff --git a/extensions/bullet/bullet/jni/build-android32.xml b/extensions/bullet/bullet/jni/build-android32.xml
new file mode 100644 (file)
index 0000000..cac3ab0
--- /dev/null
@@ -0,0 +1,14 @@
+<project name="android-natives" basedir="." default="compile-natives">\r
+       <property environment="env" />\r
+\r
+       <target name="clean">\r
+               <exec executable="${env.NDK_HOME}/ndk-build">\r
+                       <arg value="clean"/>\r
+               </exec>\r
+       </target>\r
+\r
+       <target name="compile-natives">\r
+               <echo>ndk_home: ${env.NDK_HOME}</echo>\r
+               <exec executable="${env.NDK_HOME}/ndk-build"/>\r
+       </target>\r
+</project>\r
diff --git a/extensions/bullet/bullet/jni/build-lin32.xml b/extensions/bullet/bullet/jni/build-lin32.xml
deleted file mode 100644 (file)
index 74e6543..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-<project name="bullet-natives" basedir="." default="link">\r
-       <!-- include the environment -->\r
-       <property environment="env"/>   \r
-       \r
-       <!-- output directory for generated files -->\r
-       <property name="jni-target" value="../../target/native/linux" />\r
-       <!-- output directory for distribution -->\r
-       <property name="jni-dist" value="../libs/linux" />\r
-       <property name="libname" value="libbullet.so"/>\r
-       <property name="jni-platform" value="linux"/>\r
-       \r
-       <!-- define g++ compiler, options and files to compile -->\r
-       <property name="g++" value="g++"/>\r
-       <!-- should probably contain -fPic but we use gcc 4.4.1 to compile those binaries -->\r
-       <property name="g++-opts" value="-c -Wall -O2 -mfpmath=sse -msse -DFIXED_POINT -fmessage-length=0 -m32 -fPIC -Isrc"/>\r
-       <fileset id="g++-files" dir="./">\r
-               <include name="**/*.cpp"/>\r
-               <exclude name="src/BulletMultiThreaded/GpuSoftBodySolvers/**"/>\r
-       </fileset>\r
-       \r
-       <!-- define gcc compiler, options and files to compile -->\r
-       <property name="gcc" value="gcc"/>      \r
-       <property name="gcc-opts" value="${g++-opts}"/>\r
-       <fileset id="gcc-files" dir="./">               \r
-               <include name="**/*.c"/>\r
-       </fileset>\r
-\r
-       <!-- define linker and options -->\r
-       <property name="linker" value="g++"/>\r
-       <property name="linker-opts" value="-shared -m32"/>\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="${jni-target}"/>\r
-                       <fileset dir="${jni-dist}" includes="**/*" excludes="**/.svn"/>\r
-               </delete>\r
-       </target>\r
-\r
-       <!-- compiles all C and C++ files to object files in the build directory -->\r
-       <target name="compile">\r
-               <mkdir dir="${jni-target}"/>\r
-               <apply failonerror="true" executable="${g++}" dest="${jni-target}" verbose="true">\r
-                       <arg line="${g++-opts}"/>\r
-                       <arg value="-Ijni-headers"/>\r
-                       <arg value="-Ijni-headers/${jni-platform}"/>\r
-                       <arg value="-I./"/>\r
-                       <srcfile/>\r
-                       <arg value="-o"/>\r
-                       <targetfile/>\r
-                       <fileset refid="g++-files"/>\r
-                       <chainedmapper>\r
-                               <flattenmapper/>\r
-                               <mapper type="glob" from="*.cpp" to="*.o"/>\r
-                       </chainedmapper>\r
-               </apply>\r
-               <apply failonerror="true" executable="${gcc}" dest="${jni-target}" verbose="true">\r
-                       <arg line="${gcc-opts}"/>\r
-                       <arg value="-Ijni-headers"/>\r
-                       <arg value="-Ijni-headers/${jni-platform}"/>\r
-                       <arg value="-I./"/>\r
-                       <srcfile/>\r
-                       <arg value="-o"/>\r
-                       <targetfile/>\r
-                       <fileset refid="gcc-files"/>\r
-                       <chainedmapper>\r
-                               <flattenmapper/>\r
-                               <mapper type="glob" from="*.c" to="*.o"/>\r
-                       </chainedmapper>\r
-               </apply>\r
-       </target>       \r
-\r
-       <!-- links the shared library based on the previously compiled object files -->\r
-       <target name="link" depends="compile">\r
-               <mkdir dir="${jni-dist}"/>\r
-               <apply failonerror="true" executable="${linker}" parallel="true" dir="${jni-target}">\r
-                       <arg line="${linker-opts}"/>\r
-                       <arg value="-o"/>\r
-                       <arg path="${jni-dist}/${libname}"/>            \r
-                       <fileset dir="${jni-target}">\r
-                               <patternset>\r
-                                       <include name="**/*.o"/>\r
-                               </patternset>\r
-                       </fileset>\r
-               </apply>\r
-       </target>\r
-</project>\r
diff --git a/extensions/bullet/bullet/jni/build-lin64.xml b/extensions/bullet/bullet/jni/build-lin64.xml
deleted file mode 100644 (file)
index 88f19bf..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-<project name="bullet-natives" basedir="." default="link">\r
-       <!-- include the environment -->\r
-       <property environment="env"/>   \r
-       \r
-       <!-- output directory for generated files -->\r
-       <property name="jni-target" value="../../target/native/linux64" />\r
-       <!-- output directory for distribution -->\r
-       <property name="jni-dist" value="../libs/linux64" />\r
-       <property name="libname" value="libbullet-64.so"/>\r
-       <property name="jni-platform" value="linux"/>\r
-       \r
-       <!-- define g++ compiler, options and files to compile -->\r
-       <property name="g++" value="g++"/>\r
-       <property name="g++-opts" value="-c -Wall -O2 -mfpmath=sse -msse2 -DFIXED_POINT -fmessage-length=0 -m64 -fPIC -Isrc"/>\r
-       <fileset id="g++-files" dir="./">\r
-               <include name="**/*.cpp"/>\r
-               <exclude name="src/BulletMultiThreaded/GpuSoftBodySolvers/**"/>\r
-       </fileset>\r
-       \r
-       <!-- define gcc compiler, options and files to compile -->\r
-       <property name="gcc" value="gcc"/>      \r
-       <property name="gcc-opts" value="${g++-opts}"/>\r
-       <fileset id="gcc-files" dir="./">               \r
-               <include name="**/*.c"/>                                \r
-       </fileset>\r
-\r
-       <!-- define linker and options -->\r
-       <property name="linker" value="g++"/>\r
-       <property name="linker-opts" value="-shared"/>\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="${jni-target}"/>\r
-                       <fileset dir="${jni-dist}" includes="**/*" excludes="**/.svn"/>\r
-               </delete>\r
-       </target>\r
-\r
-       <!-- compiles all C and C++ files to object files in the build directory -->\r
-       <target name="compile">\r
-               <mkdir dir="${jni-target}"/>\r
-               <apply failonerror="true" executable="${g++}" dest="${jni-target}" verbose="true">\r
-                       <arg line="${g++-opts}"/>\r
-                       <arg value="-Ijni-headers"/>\r
-                       <arg value="-Ijni-headers/${jni-platform}"/>\r
-                       <arg value="-I./"/>\r
-                       <srcfile/>\r
-                       <arg value="-o"/>\r
-                       <targetfile/>\r
-                       <fileset refid="g++-files"/>\r
-                       <chainedmapper>\r
-                               <flattenmapper/>\r
-                               <mapper type="glob" from="*.cpp" to="*.o"/>\r
-                       </chainedmapper>\r
-               </apply>\r
-               <apply failonerror="true" executable="${gcc}" dest="${jni-target}" verbose="true">\r
-                       <arg line="${gcc-opts}"/>\r
-                       <arg value="-Ijni-headers"/>\r
-                       <arg value="-Ijni-headers/${jni-platform}"/>\r
-                       <arg value="-I./"/>\r
-                       <srcfile/>\r
-                       <arg value="-o"/>\r
-                       <targetfile/>\r
-                       <fileset refid="gcc-files"/>\r
-                       <chainedmapper>\r
-                               <flattenmapper/>\r
-                               <mapper type="glob" from="*.c" to="*.o"/>\r
-                       </chainedmapper>\r
-               </apply>\r
-       </target>       \r
-\r
-       <!-- links the shared library based on the previously compiled object files -->\r
-       <target name="link" depends="compile">\r
-               <mkdir dir="${jni-dist}"/>\r
-               <apply failonerror="true" executable="${linker}" parallel="true">\r
-                       <arg value="${linker-opts}"/>\r
-                       <arg value="-m64"/>\r
-                       <arg value="-o"/>\r
-                       <arg path="${jni-dist}/${libname}"/>            \r
-                       <fileset dir="${jni-target}">\r
-                               <patternset>\r
-                                       <include name="**/*.o"/>\r
-                               </patternset>\r
-                       </fileset>\r
-               </apply>\r
-       </target>\r
-</project>\r
diff --git a/extensions/bullet/bullet/jni/build-linux32.xml b/extensions/bullet/bullet/jni/build-linux32.xml
new file mode 100644 (file)
index 0000000..795c214
--- /dev/null
@@ -0,0 +1,98 @@
+<project name="bullet-Linux-32" basedir="." default="link">\r
+       <!-- include the environment -->\r
+       <property environment="env"/>   \r
+       <!-- output directory for temporary object files -->\r
+       <property name="buildDir" value="target/linux32" />\r
+       <!-- output directory for the shared library -->\r
+       <property name="libsDir" value="../libs/linux32" />\r
+       <!-- the name of the shared library -->\r
+       <property name="libName" value="libbullet.so"/>\r
+       <!-- the jni header jniPlatform to use -->\r
+       <property name="jniPlatform" value="linux"/>\r
+       <!-- the compilerPrefix for the C & C++ compilers -->\r
+       <property name="compilerPrefix" value=""/>      \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 -mfpmath=sse -msse -fmessage-length=0 -m32 -fPIC"/>\r
+       <fileset id="gcc-files" dir="./">\r
+                               <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 -mfpmath=sse -msse -fmessage-length=0 -m32 -fPIC"/>\r
+       <fileset id="g++-files" dir="./">\r
+                               <include name="**/*.cpp"/>
+\r
+                               <exclude name="src/BulletMultiThreaded/GpuSoftBodySolvers/**"/>
+\r
+       </fileset>\r
+\r
+       <!-- define linker and options -->\r
+       <property name="linker" value="${compilerPrefix}g++"/>\r
+       <property name="linker-opts" value="-shared -m32"/>\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
+       <!-- compiles all C and C++ files to object files in the build directory -->\r
+       <target name="compile">\r
+               <mkdir dir="${buildDir}"/>\r
+               <apply failonerror="true" executable="${g++}" dest="${buildDir}" verbose="true">\r
+                       <arg line="${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
+                       <chainedmapper>\r
+                               <flattenmapper/>\r
+                               <mapper type="glob" from="*.cpp" to="*.o"/>\r
+                       </chainedmapper>\r
+               </apply>\r
+               <apply failonerror="true" executable="${gcc}" dest="${buildDir}" verbose="true">\r
+                       <arg line="${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
+                       <chainedmapper>\r
+                               <flattenmapper/>\r
+                               <mapper type="glob" from="*.c" to="*.o"/>\r
+                       </chainedmapper>\r
+               </apply>\r
+       </target>       \r
+\r
+       <!-- links the shared library based on the previously compiled object files --> \r
+       <target name="link" depends="compile">\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
+       </target>       \r
+</project>\r
diff --git a/extensions/bullet/bullet/jni/build-linux64.xml b/extensions/bullet/bullet/jni/build-linux64.xml
new file mode 100644 (file)
index 0000000..f9d65ef
--- /dev/null
@@ -0,0 +1,98 @@
+<project name="bullet-Linux-64" basedir="." default="link">\r
+       <!-- include the environment -->\r
+       <property environment="env"/>   \r
+       <!-- output directory for temporary object files -->\r
+       <property name="buildDir" value="target/linux64" />\r
+       <!-- output directory for the shared library -->\r
+       <property name="libsDir" value="../libs/linux64" />\r
+       <!-- the name of the shared library -->\r
+       <property name="libName" value="libbullet64.so"/>\r
+       <!-- the jni header jniPlatform to use -->\r
+       <property name="jniPlatform" value="linux"/>\r
+       <!-- the compilerPrefix for the C & C++ compilers -->\r
+       <property name="compilerPrefix" value=""/>      \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 -mfpmath=sse -msse -fmessage-length=0 -m64 -fPIC"/>\r
+       <fileset id="gcc-files" dir="./">\r
+                               <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 -mfpmath=sse -msse -fmessage-length=0 -m64 -fPIC"/>\r
+       <fileset id="g++-files" dir="./">\r
+                               <include name="**/*.cpp"/>
+\r
+                               <exclude name="src/BulletMultiThreaded/GpuSoftBodySolvers/**"/>
+\r
+       </fileset>\r
+\r
+       <!-- define linker and options -->\r
+       <property name="linker" value="${compilerPrefix}g++"/>\r
+       <property name="linker-opts" value="-shared -m64"/>\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
+       <!-- compiles all C and C++ files to object files in the build directory -->\r
+       <target name="compile">\r
+               <mkdir dir="${buildDir}"/>\r
+               <apply failonerror="true" executable="${g++}" dest="${buildDir}" verbose="true">\r
+                       <arg line="${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
+                       <chainedmapper>\r
+                               <flattenmapper/>\r
+                               <mapper type="glob" from="*.cpp" to="*.o"/>\r
+                       </chainedmapper>\r
+               </apply>\r
+               <apply failonerror="true" executable="${gcc}" dest="${buildDir}" verbose="true">\r
+                       <arg line="${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
+                       <chainedmapper>\r
+                               <flattenmapper/>\r
+                               <mapper type="glob" from="*.c" to="*.o"/>\r
+                       </chainedmapper>\r
+               </apply>\r
+       </target>       \r
+\r
+       <!-- links the shared library based on the previously compiled object files --> \r
+       <target name="link" depends="compile">\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
+       </target>       \r
+</project>\r
diff --git a/extensions/bullet/bullet/jni/build-macos.xml b/extensions/bullet/bullet/jni/build-macos.xml
deleted file mode 100644 (file)
index f442254..0000000
+++ /dev/null
@@ -1,90 +0,0 @@
-<project name="gdx-natives" basedir="." default="link">\r
-       <!-- include the environment -->\r
-       <property environment="env"/>   \r
-       \r
-       <!-- output directory for generated files -->\r
-       <property name="jni-target" value="../../target/native/mac" />\r
-       <!-- output directory for distribution -->\r
-       <property name="jni-dist" value="../libs/mac" />\r
-       <property name="libname" value="libgdx.dylib"/>\r
-       <property name="jni-platform" value="mac"/>\r
-       \r
-       <!-- define g++ compiler, options and files to compile -->\r
-       <property name="g++" value="g++"/>\r
-       <!-- should probably contain -fPic but we use gcc 4.4.1 to compile those binaries -->\r
-       <!-- no more PPC support by XCode :( <property name="g++-opts" value="-c -Wall -O2 -arch ppc -arch i386 -arch x86_64 -DFIXED_POINT -fmessage-length=0 -fPIC"/>-->\r
-       <property name="g++-opts" value="-c -Wall -O2 -arch i386 -arch x86_64 -DFIXED_POINT -fmessage-length=0 -fPIC -mmacosx-version-min=10.5 -Isrc"/>\r
-       <fileset id="g++-files" dir="./">\r
-               <include name="**/*.cpp"/>\r
-               <exclude name="src/BulletMultiThreaded/GpuSoftBodySolvers/**"/>\r
-       </fileset>\r
-       \r
-       <!-- define gcc compiler, options and files to compile -->\r
-       <property name="gcc" value="gcc"/>      \r
-       <property name="gcc-opts" value="${g++-opts}"/>\r
-       <fileset id="gcc-files" dir="./">               \r
-               <include name="**/*.c"/>\r
-               <exclude name="src/BulletMultiThreaded/GpuSoftBodySolvers/**"/>         \r
-       </fileset>\r
-\r
-       <!-- define linker and options -->\r
-       <property name="linker" value="g++"/>\r
-       <!-- no more ppc :( <property name="linker-opts" value="-shared -arch ppc -arch i386 -arch x86_64"/> -->\r
-       <property name="linker-opts" value="-shared -arch i386 -arch x86_64 -mmacosx-version-min=10.5"/>\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="${jni-target}"/>\r
-                       <fileset dir="${jni-dist}" includes="**/*" excludes="**/.svn"/>\r
-               </delete>\r
-       </target>\r
-\r
-       <!-- compiles all C and C++ files to object files in the build directory -->\r
-       <target name="compile">\r
-               <mkdir dir="${jni-target}"/>\r
-               <apply failonerror="true" executable="${g++}" dest="${jni-target}" verbose="true">\r
-                       <arg line="${g++-opts}"/>\r
-                       <arg value="-Ijni-headers"/>\r
-                       <arg value="-Ijni-headers/${jni-platform}"/>\r
-                       <arg value="-I./"/>\r
-                       <srcfile/>\r
-                       <arg value="-o"/>\r
-                       <targetfile/>\r
-                       <fileset refid="g++-files"/>\r
-                       <chainedmapper>\r
-                               <flattenmapper/>\r
-                               <mapper type="glob" from="*.cpp" to="*.o"/>\r
-                       </chainedmapper>\r
-               </apply>\r
-               <apply failonerror="true" executable="${gcc}" dest="${jni-target}" verbose="true">\r
-                       <arg line="${gcc-opts}"/>\r
-                       <arg value="-Ijni-headers"/>\r
-                       <arg value="-Ijni-headers/${jni-platform}"/>\r
-                       <arg value="-I./"/>\r
-                       <srcfile/>\r
-                       <arg value="-o"/>\r
-                       <targetfile/>\r
-                       <fileset refid="gcc-files"/>\r
-                       <chainedmapper>\r
-                               <flattenmapper/>\r
-                               <mapper type="glob" from="*.c" to="*.o"/>\r
-                       </chainedmapper>\r
-               </apply>\r
-       </target>       \r
-\r
-       <!-- links the shared library based on the previously compiled object files -->\r
-       <target name="link" depends="compile">\r
-               <mkdir dir="${jni-dist}"/>\r
-               <apply failonerror="true" executable="${linker}" parallel="true" dir="${jni-target}">\r
-                       <arg line="${linker-opts}"/>\r
-                       <arg value="-o"/>\r
-                       <arg path="${jni-dist}/${libname}"/>            \r
-                       <fileset dir="${jni-target}">\r
-                               <patternset>\r
-                                       <include name="**/*.o"/>\r
-                               </patternset>\r
-                       </fileset>\r
-               </apply>\r
-       </target>\r
-</project>\r
diff --git a/extensions/bullet/bullet/jni/build-macosx32.xml b/extensions/bullet/bullet/jni/build-macosx32.xml
new file mode 100644 (file)
index 0000000..c59d13c
--- /dev/null
@@ -0,0 +1,98 @@
+<project name="bullet-MacOsX-32" basedir="." default="link">\r
+       <!-- include the environment -->\r
+       <property environment="env"/>   \r
+       <!-- output directory for temporary object files -->\r
+       <property name="buildDir" value="target/macosx32" />\r
+       <!-- output directory for the shared library -->\r
+       <property name="libsDir" value="../libs/macosx32" />\r
+       <!-- the name of the shared library -->\r
+       <property name="libName" value="libbullet.dylib"/>\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
+       \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 -arch i386 -arch x86_64 -DFIXED_POINT -fmessage-length=0 -fPIC -mmacosx-version-min=10.5"/>\r
+       <fileset id="gcc-files" dir="./">\r
+                               <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 -arch i386 -arch x86_64 -DFIXED_POINT -fmessage-length=0 -fPIC -mmacosx-version-min=10.5"/>\r
+       <fileset id="g++-files" dir="./">\r
+                               <include name="**/*.cpp"/>
+\r
+                               <exclude name="src/BulletMultiThreaded/GpuSoftBodySolvers/**"/>
+\r
+       </fileset>\r
+\r
+       <!-- 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
+       \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
+       <!-- compiles all C and C++ files to object files in the build directory -->\r
+       <target name="compile">\r
+               <mkdir dir="${buildDir}"/>\r
+               <apply failonerror="true" executable="${g++}" dest="${buildDir}" verbose="true">\r
+                       <arg line="${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
+                       <chainedmapper>\r
+                               <flattenmapper/>\r
+                               <mapper type="glob" from="*.cpp" to="*.o"/>\r
+                       </chainedmapper>\r
+               </apply>\r
+               <apply failonerror="true" executable="${gcc}" dest="${buildDir}" verbose="true">\r
+                       <arg line="${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
+                       <chainedmapper>\r
+                               <flattenmapper/>\r
+                               <mapper type="glob" from="*.c" to="*.o"/>\r
+                       </chainedmapper>\r
+               </apply>\r
+       </target>       \r
+\r
+       <!-- links the shared library based on the previously compiled object files --> \r
+       <target name="link" depends="compile">\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
+       </target>       \r
+</project>\r
diff --git a/extensions/bullet/bullet/jni/build-win32.xml b/extensions/bullet/bullet/jni/build-win32.xml
deleted file mode 100644 (file)
index acd90b9..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-<project name="bullet-natives" basedir="." default="link">\r
-       <!-- include the environment -->\r
-       <property environment="env"/>   \r
-       \r
-       <property name="prefix" value="i586-mingw32msvc-"/>     \r
-\r
-       <!-- output directory for generated files -->\r
-       <property name="jni-target" value="../../target/native/windows" />\r
-       <!-- output directory for distribution -->\r
-       <property name="jni-dist" value="../libs/windows" />\r
-       <property name="libname" value="bullet.dll"/>\r
-       <property name="jni-platform" value="win32"/>\r
-       \r
-       <!-- define g++ compiler, options and files to compile -->\r
-       <property name="g++" value="${prefix}g++"/>\r
-       <property name="g++-opts" value="-c -Wall -O2 -mfpmath=sse -msse2 -DFIXED_POINT -fmessage-length=0 -m32 -Isrc"/>\r
-       <fileset id="g++-files" dir="./">\r
-               <include name="**/*.cpp"/>\r
-               <exclude name="src/BulletMultiThreaded/GpuSoftBodySolvers/**"/>\r
-       </fileset>\r
-       \r
-       <!-- define gcc compiler, options and files to compile -->\r
-       <property name="gcc" value="${prefix}gcc"/>     \r
-       <property name="gcc-opts" value="${g++-opts}"/>\r
-       <fileset id="gcc-files" dir="./">               \r
-               <include name="**/*.c"/>                                \r
-       </fileset>\r
-\r
-       <!-- define linker and options -->\r
-       <property name="linker" value="${prefix}g++"/>\r
-       <property name="linker-opts" value="-Wl,--kill-at -shared"/>\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="${jni-target}"/>\r
-                       <fileset dir="${jni-dist}" includes="**/*" excludes="**/.svn"/>\r
-               </delete>\r
-       </target>\r
-\r
-       <!-- compiles all C and C++ files to object files in the build directory -->\r
-       <target name="compile">\r
-               <mkdir dir="${jni-target}"/>\r
-               <apply failonerror="true" executable="${g++}" dest="${jni-target}" verbose="true">\r
-                       <arg line="${g++-opts}"/>\r
-                       <arg value="-Ijni-headers"/>\r
-                       <arg value="-Ijni-headers/${jni-platform}"/>\r
-                       <arg value="-I."/>\r
-                       <srcfile/>\r
-                       <arg value="-o"/>\r
-                       <targetfile/>\r
-                       <fileset refid="g++-files"/>\r
-                       <chainedmapper>\r
-                               <flattenmapper/>\r
-                               <mapper type="glob" from="*.cpp" to="*.o"/>\r
-                       </chainedmapper>\r
-               </apply>\r
-               <apply failonerror="true" executable="${gcc}" dest="${jni-target}" verbose="true">\r
-                       <arg line="${gcc-opts}"/>\r
-                       <arg value="-Ijni-headers"/>\r
-                       <arg value="-Ijni-headers/${jni-platform}"/>\r
-                       <arg value="-I."/>\r
-                       <srcfile/>\r
-                       <arg value="-o"/>\r
-                       <targetfile/>\r
-                       <fileset refid="gcc-files"/>\r
-                       <chainedmapper>\r
-                               <flattenmapper/>\r
-                               <mapper type="glob" from="*.c" to="*.o"/>\r
-                       </chainedmapper>\r
-               </apply>\r
-       </target>       \r
-\r
-       <!-- links the shared library based on the previously compiled object files -->\r
-       <target name="link" depends="compile">\r
-               <mkdir dir="${jni-dist}"/>\r
-               <apply failonerror="true" executable="${linker}" parallel="true" dir="${jni-target}">\r
-                       <arg line="${linker-opts}"/>\r
-                       <arg value="-o"/>\r
-                       <arg path="${jni-dist}/${libname}"/>            \r
-                       <fileset dir="${jni-target}">\r
-                               <patternset>\r
-                                       <include name="**/*.o"/>\r
-                               </patternset>\r
-                       </fileset>\r
-               </apply>\r
-       </target>\r
-</project>\r
diff --git a/extensions/bullet/bullet/jni/build-win32home.xml b/extensions/bullet/bullet/jni/build-win32home.xml
deleted file mode 100644 (file)
index bff570e..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
-<project name="bullet-natives" basedir="." default="link">\r
-       <!-- include the environment -->\r
-       <property environment="env"/>   \r
-       \r
-       <property name="prefix" value=""/>      \r
-\r
-       <!-- output directory for generated files -->\r
-       <property name="jni-target" value="../../target/native/windows" />\r
-       <!-- output directory for distribution -->\r
-       <property name="jni-dist" value="../libs/windows" />\r
-       <property name="libname" value="bullet.dll"/>\r
-       <property name="jni-platform" value="win32"/>\r
-       \r
-       <!-- define g++ compiler, options and files to compile -->\r
-       <property name="g++" value="${prefix}g++"/>\r
-       <property name="g++-opts" value="-c -Wall -O2 -mfpmath=sse -msse2 -DFIXED_POINT -fmessage-length=0 -m32 -Isrc"/>\r
-       <fileset id="g++-files" dir="./">\r
-               <include name="**/*.cpp"/>\r
-               <exclude name="src/BulletMultiThreaded/GpuSoftBodySolvers/**"/>\r
-       </fileset>\r
-       \r
-       <!-- define gcc compiler, options and files to compile -->\r
-       <property name="gcc" value="${prefix}gcc"/>     \r
-       <property name="gcc-opts" value="${g++-opts}"/>\r
-       <fileset id="gcc-files" dir="./">               \r
-               <include name="**/*.c"/>                                \r
-       </fileset>\r
-\r
-       <!-- define linker and options -->\r
-       <property name="linker" value="${prefix}g++"/>\r
-       <property name="linker-opts" value="-Wl,--kill-at -shared -static-libgcc -static-libstdc++"/>\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="${jni-target}"/>\r
-                       <fileset dir="${jni-dist}" includes="**/*" excludes="**/.svn"/>\r
-               </delete>\r
-       </target>\r
-\r
-       <!-- compiles all C and C++ files to object files in the build directory -->\r
-       <target name="compile">\r
-               <mkdir dir="${jni-target}"/>\r
-               <apply failonerror="true" executable="${g++}" dest="${jni-target}" verbose="true">\r
-                       <arg line="${g++-opts}"/>\r
-                       <arg value="-Ijni-headers"/>\r
-                       <arg value="-Ijni-headers\${jni-platform}"/>\r
-                       <arg value="-I."/>\r
-                       <srcfile/>\r
-                       <arg value="-o"/>\r
-                       <targetfile/>\r
-                       <fileset refid="g++-files"/>\r
-                       <chainedmapper>\r
-                               <flattenmapper/>\r
-                               <mapper type="glob" from="*.cpp" to="*.o"/>\r
-                       </chainedmapper>\r
-               </apply>\r
-               <apply failonerror="true" executable="${gcc}" dest="${jni-target}" verbose="true">\r
-                       <arg line="${gcc-opts}"/>\r
-                       <arg value="-Ijni-headers"/>\r
-                       <arg value="-Ijni-headers\${jni-platform}"/>\r
-                       <arg value="-I."/>\r
-                       <srcfile/>\r
-                       <arg value="-o"/>\r
-                       <targetfile/>\r
-                       <fileset refid="gcc-files"/>\r
-                       <chainedmapper>\r
-                               <flattenmapper/>\r
-                               <mapper type="glob" from="*.c" to="*.o"/>\r
-                       </chainedmapper>\r
-               </apply>\r
-       </target>       \r
-\r
-       <!-- links the shared library based on the previously compiled object files -->\r
-       <target name="link" depends="compile">\r
-               <mkdir dir="${jni-dist}"/>\r
-               <apply failonerror="true" executable="${linker}" parallel="true" dir="${jni-target}">\r
-                       <arg line="${linker-opts}"/>\r
-                       <arg value="-o"/>\r
-                       <arg path="${jni-dist}\${libname}"/>            \r
-                       <fileset dir="${jni-target}">\r
-                               <patternset>\r
-                                       <include name="**/*.o"/>\r
-                               </patternset>\r
-                       </fileset>\r
-               </apply>\r
-               <ant antfile="build.xml" target="pack-natives"/>\r
-       </target>\r
-</project>\r
diff --git a/extensions/bullet/bullet/jni/build-win64.xml b/extensions/bullet/bullet/jni/build-win64.xml
deleted file mode 100644 (file)
index 65aa0d4..0000000
+++ /dev/null
@@ -1,101 +0,0 @@
-<project name="bullet-natives" basedir="." default="link">\r
-       <!-- include the environment -->\r
-       <property environment="env"/>   \r
-       <property name="prefix" value="x86_64-w64-mingw32-"/>   \r
-\r
-       <!-- need to path a few files, should do this with a diff really :p, see README in patched/ -->\r
-       <target name="patch">\r
-               <copy todir="src" verbose="true" overwrite="true">\r
-                       <fileset dir="../patched"/>\r
-               </copy>\r
-       </target>\r
-\r
-       <!-- output directory for generated files -->\r
-       <property name="jni-target" value="../../target/native/windows64" />\r
-       <!-- output directory for distribution -->\r
-       <property name="jni-dist" value="../libs/windows64" />\r
-       <property name="libname" value="bullet-64.dll"/>\r
-       <property name="jni-platform" value="win32"/>\r
-       \r
-       <!-- define g++ compiler, options and files to compile -->\r
-       <property name="g++" value="${prefix}g++"/>\r
-       <property name="g++-opts" value="-c -Wall -O2 -mfpmath=sse -msse2 -DFIXED_POINT -fmessage-length=0 -m64 -Isrc"/>\r
-       <fileset id="g++-files" dir="./">\r
-               <include name="**/*.cpp"/>\r
-               <exclude name="src/BulletMultiThreaded/GpuSoftBodySolvers/**"/>\r
-       </fileset>\r
-       \r
-       <!-- define gcc compiler, options and files to compile -->\r
-       <property name="gcc" value="${prefix}gcc"/>     \r
-       <property name="gcc-opts" value="${g++-opts}"/>\r
-       <fileset id="gcc-files" dir="./">               \r
-               <include name="**/*.c"/>                                \r
-       </fileset>\r
-\r
-       <!-- define linker and options -->\r
-       <property name="linker" value="${prefix}g++"/>\r
-       <property name="linker-opts" value="-Wl,--kill-at -shared -static-libgcc -static-libstdc++"/>\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="${jni-target}"/>\r
-                       <fileset dir="${jni-dist}" includes="**/*" excludes="**/.svn"/>\r
-               </delete>\r
-       </target>\r
-\r
-       <!-- compiles all C and C++ files to object files in the build directory -->\r
-       <target name="compile" depends="patch">\r
-               <mkdir dir="${jni-target}"/>\r
-               <apply failonerror="true" executable="${g++}" dest="${jni-target}" verbose="true">\r
-                       <arg line="${g++-opts}"/>\r
-                       <arg value="-Ijni-headers"/>\r
-                       <arg value="-Ijni-headers/${jni-platform}"/>\r
-                       <arg value="-I."/>\r
-                       <srcfile/>\r
-                       <arg value="-o"/>\r
-                       <targetfile/>\r
-                       <fileset refid="g++-files"/>\r
-                       <chainedmapper>\r
-                               <flattenmapper/>\r
-                               <mapper type="glob" from="*.cpp" to="*.o"/>\r
-                       </chainedmapper>\r
-               </apply>\r
-               <apply failonerror="true" executable="${gcc}" dest="${jni-target}" verbose="true">\r
-                       <arg line="${gcc-opts}"/>\r
-                       <arg value="-Ijni-headers"/>\r
-                       <arg value="-Ijni-headers/${jni-platform}"/>\r
-                       <arg value="-I."/>\r
-                       <srcfile/>\r
-                       <arg value="-o"/>\r
-                       <targetfile/>\r
-                       <fileset refid="gcc-files"/>\r
-                       <chainedmapper>\r
-                               <flattenmapper/>\r
-                               <mapper type="glob" from="*.c" to="*.o"/>\r
-                       </chainedmapper>\r
-               </apply>\r
-       </target>       \r
-\r
-       <!-- revert the nasty "patch" -->\r
-       <target name="revert" depends="compile">\r
-               <exec executable="svn" dir=".">\r
-                       <arg line="revert -R src"/>\r
-               </exec>\r
-       </target>\r
-\r
-       <!-- links the shared library based on the previously compiled object files --> \r
-       <target name="link" depends="revert">\r
-               <mkdir dir="${jni-dist}"/>\r
-               <apply failonerror="true" executable="${linker}" parallel="true" dir="${jni-target}">\r
-                       <arg line="${linker-opts}"/>\r
-                       <arg value="-o"/>\r
-                       <arg path="${jni-dist}/${libname}"/>            \r
-                       <fileset dir="${jni-target}">\r
-                               <patternset>\r
-                                       <include name="**/*.o"/>\r
-                               </patternset>\r
-                       </fileset>\r
-               </apply>\r
-       </target>       \r
-</project>\r
diff --git a/extensions/bullet/bullet/jni/build-win64home.xml b/extensions/bullet/bullet/jni/build-win64home.xml
deleted file mode 100644 (file)
index 1e48446..0000000
+++ /dev/null
@@ -1,91 +0,0 @@
-<project name="gdx-natives" basedir="." default="link">\r
-       <!-- include the environment -->\r
-       <property environment="env"/>   \r
-\r
-       <property name="prefix" value="x86_64-w64-mingw32-"/>   \r
-\r
-       <!-- output directory for generated files -->\r
-       <property name="jni-target" value="../../target/native/windows64" />\r
-       <!-- output directory for distribution -->\r
-       <property name="jni-dist" value="../libs/windows64" />\r
-       <property name="libname" value="gdx-64.dll"/>\r
-       <property name="jni-platform" value="win32"/>\r
-       \r
-       <!-- define g++ compiler, options and files to compile -->\r
-       <property name="g++" value="${prefix}g++"/>\r
-       <property name="g++-opts" value="-c -Wall -O2 -mfpmath=sse -msse2 -DFIXED_POINT -fmessage-length=0 -m64"/>\r
-       <fileset id="g++-files" dir="./">\r
-               <include name="**/*.cpp"/>\r
-               <exclude name="Mpg123Decoder.cpp"/>\r
-               <exclude name="mpg123/**"/>\r
-       </fileset>\r
-       \r
-       <!-- define gcc compiler, options and files to compile -->\r
-       <property name="gcc" value="${prefix}gcc"/>     \r
-       <property name="gcc-opts" value="${g++-opts}"/>\r
-       <fileset id="gcc-files" dir="./">               \r
-               <include name="**/*.c"/>                                \r
-               <exclude name="mpg123/**"/>\r
-       </fileset>\r
-\r
-       <!-- define linker and options -->\r
-       <property name="linker" value="${prefix}g++"/>\r
-       <property name="linker-opts" value="-Wl,--kill-at -shared -static-libgcc -static-libstdc++"/>\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="${jni-target}"/>\r
-                       <fileset dir="${jni-dist}" includes="**/*" excludes="**/.svn"/>\r
-               </delete>\r
-       </target>\r
-\r
-       <!-- compiles all C and C++ files to object files in the build directory -->\r
-       <target name="compile">\r
-               <mkdir dir="${jni-target}"/>\r
-               <apply failonerror="true" executable="${g++}" dest="${jni-target}" verbose="true">\r
-                       <arg line="${g++-opts}"/>\r
-                       <arg value="-Ijni-headers"/>\r
-                       <arg value="-Ijni-headers/${jni-platform}"/>\r
-                       <arg value="-I."/>\r
-                       <srcfile/>\r
-                       <arg value="-o"/>\r
-                       <targetfile/>\r
-                       <fileset refid="g++-files"/>\r
-                       <chainedmapper>\r
-                               <flattenmapper/>\r
-                               <mapper type="glob" from="*.cpp" to="*.o"/>\r
-                       </chainedmapper>\r
-               </apply>\r
-               <apply failonerror="true" executable="${gcc}" dest="${jni-target}" verbose="true">\r
-                       <arg line="${gcc-opts}"/>\r
-                       <arg value="-Ijni-headers"/>\r
-                       <arg value="-Ijni-headers/${jni-platform}"/>\r
-                       <arg value="-I."/>\r
-                       <srcfile/>\r
-                       <arg value="-o"/>\r
-                       <targetfile/>\r
-                       <fileset refid="gcc-files"/>\r
-                       <chainedmapper>\r
-                               <flattenmapper/>\r
-                               <mapper type="glob" from="*.c" to="*.o"/>\r
-                       </chainedmapper>\r
-               </apply>\r
-       </target>       \r
-\r
-       <!-- links the shared library based on the previously compiled object files --> \r
-       <target name="link" depends="compile">\r
-               <mkdir dir="${jni-dist}"/>\r
-               <apply failonerror="true" executable="${linker}" parallel="true" dir="${jni-target}">\r
-                       <arg line="${linker-opts}"/>\r
-                       <arg value="-o"/>\r
-                       <arg path="${jni-dist}/${libname}"/>            \r
-                       <fileset dir="${jni-target}">\r
-                               <patternset>\r
-                                       <include name="**/*.o"/>\r
-                               </patternset>\r
-                       </fileset>\r
-               </apply>\r
-               <ant antfile="build.xml" target="pack-natives"/>\r
-       </target>       \r
-</project>\r
diff --git a/extensions/bullet/bullet/jni/build-windows32.xml b/extensions/bullet/bullet/jni/build-windows32.xml
new file mode 100644 (file)
index 0000000..f3e1a69
--- /dev/null
@@ -0,0 +1,98 @@
+<project name="bullet-Windows-32" basedir="." default="link">\r
+       <!-- include the environment -->\r
+       <property environment="env"/>   \r
+       <!-- output directory for temporary object files -->\r
+       <property name="buildDir" value="target/windows32" />\r
+       <!-- output directory for the shared library -->\r
+       <property name="libsDir" value="../libs/windows32" />\r
+       <!-- the name of the shared library -->\r
+       <property name="libName" value="bullet.dll"/>\r
+       <!-- the jni header jniPlatform to use -->\r
+       <property name="jniPlatform" value="win32"/>\r
+       <!-- the compilerPrefix for the C & C++ compilers -->\r
+       <property name="compilerPrefix" value="i586-mingw32msvc-"/>     \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 -mfpmath=sse -msse2 -fmessage-length=0 -m32"/>\r
+       <fileset id="gcc-files" dir="./">\r
+                               <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 -mfpmath=sse -msse2 -fmessage-length=0 -m32"/>\r
+       <fileset id="g++-files" dir="./">\r
+                               <include name="**/*.cpp"/>
+\r
+                               <exclude name="src/BulletMultiThreaded/GpuSoftBodySolvers/**"/>
+\r
+       </fileset>\r
+\r
+       <!-- define linker and options -->\r
+       <property name="linker" value="${compilerPrefix}g++"/>\r
+       <property name="linker-opts" value="-Wl,--kill-at -shared -m32"/>\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
+       <!-- compiles all C and C++ files to object files in the build directory -->\r
+       <target name="compile">\r
+               <mkdir dir="${buildDir}"/>\r
+               <apply failonerror="true" executable="${g++}" dest="${buildDir}" verbose="true">\r
+                       <arg line="${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
+                       <chainedmapper>\r
+                               <flattenmapper/>\r
+                               <mapper type="glob" from="*.cpp" to="*.o"/>\r
+                       </chainedmapper>\r
+               </apply>\r
+               <apply failonerror="true" executable="${gcc}" dest="${buildDir}" verbose="true">\r
+                       <arg line="${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
+                       <chainedmapper>\r
+                               <flattenmapper/>\r
+                               <mapper type="glob" from="*.c" to="*.o"/>\r
+                       </chainedmapper>\r
+               </apply>\r
+       </target>       \r
+\r
+       <!-- links the shared library based on the previously compiled object files --> \r
+       <target name="link" depends="compile">\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
+       </target>       \r
+</project>\r
diff --git a/extensions/bullet/bullet/jni/build-windows32home.xml b/extensions/bullet/bullet/jni/build-windows32home.xml
new file mode 100644 (file)
index 0000000..828feb3
--- /dev/null
@@ -0,0 +1,98 @@
+<project name="bullet-Windows-32" basedir="." default="link">\r
+       <!-- include the environment -->\r
+       <property environment="env"/>   \r
+       <!-- output directory for temporary object files -->\r
+       <property name="buildDir" value="target/windows32" />\r
+       <!-- output directory for the shared library -->\r
+       <property name="libsDir" value="../libs/windows32" />\r
+       <!-- the name of the shared library -->\r
+       <property name="libName" value="bullet.dll"/>\r
+       <!-- the jni header jniPlatform to use -->\r
+       <property name="jniPlatform" value="win32"/>\r
+       <!-- the compilerPrefix for the C & C++ compilers -->\r
+       <property name="compilerPrefix" value=""/>      \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 -mfpmath=sse -msse2 -fmessage-length=0 -m32"/>\r
+       <fileset id="gcc-files" dir="./">\r
+                               <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 -mfpmath=sse -msse2 -fmessage-length=0 -m32"/>\r
+       <fileset id="g++-files" dir="./">\r
+                               <include name="**/*.cpp"/>
+\r
+                               <exclude name="src/BulletMultiThreaded/GpuSoftBodySolvers/**"/>
+\r
+       </fileset>\r
+\r
+       <!-- define linker and options -->\r
+       <property name="linker" value="${compilerPrefix}g++"/>\r
+       <property name="linker-opts" value="-Wl,--kill-at -shared -m32"/>\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
+       <!-- compiles all C and C++ files to object files in the build directory -->\r
+       <target name="compile">\r
+               <mkdir dir="${buildDir}"/>\r
+               <apply failonerror="true" executable="${g++}" dest="${buildDir}" verbose="true">\r
+                       <arg line="${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
+                       <chainedmapper>\r
+                               <flattenmapper/>\r
+                               <mapper type="glob" from="*.cpp" to="*.o"/>\r
+                       </chainedmapper>\r
+               </apply>\r
+               <apply failonerror="true" executable="${gcc}" dest="${buildDir}" verbose="true">\r
+                       <arg line="${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
+                       <chainedmapper>\r
+                               <flattenmapper/>\r
+                               <mapper type="glob" from="*.c" to="*.o"/>\r
+                       </chainedmapper>\r
+               </apply>\r
+       </target>       \r
+\r
+       <!-- links the shared library based on the previously compiled object files --> \r
+       <target name="link" depends="compile">\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
+       </target>       \r
+</project>\r
diff --git a/extensions/bullet/bullet/jni/build-windows64.xml b/extensions/bullet/bullet/jni/build-windows64.xml
new file mode 100644 (file)
index 0000000..c618bc9
--- /dev/null
@@ -0,0 +1,98 @@
+<project name="bullet-Windows-64" basedir="." default="link">\r
+       <!-- include the environment -->\r
+       <property environment="env"/>   \r
+       <!-- output directory for temporary object files -->\r
+       <property name="buildDir" value="target/windows64" />\r
+       <!-- output directory for the shared library -->\r
+       <property name="libsDir" value="../libs/windows64" />\r
+       <!-- the name of the shared library -->\r
+       <property name="libName" value="bullet64.dll"/>\r
+       <!-- the jni header jniPlatform to use -->\r
+       <property name="jniPlatform" value="win32"/>\r
+       <!-- the compilerPrefix for the C & C++ compilers -->\r
+       <property name="compilerPrefix" value="x86_64-w64-mingw32-"/>   \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 -mfpmath=sse -msse2 -fmessage-length=0 -m64"/>\r
+       <fileset id="gcc-files" dir="./">\r
+                               <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 -mfpmath=sse -msse2 -fmessage-length=0 -m64"/>\r
+       <fileset id="g++-files" dir="./">\r
+                               <include name="**/*.cpp"/>
+\r
+                               <exclude name="src/BulletMultiThreaded/GpuSoftBodySolvers/**"/>
+\r
+       </fileset>\r
+\r
+       <!-- 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
+       \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
+       <!-- compiles all C and C++ files to object files in the build directory -->\r
+       <target name="compile">\r
+               <mkdir dir="${buildDir}"/>\r
+               <apply failonerror="true" executable="${g++}" dest="${buildDir}" verbose="true">\r
+                       <arg line="${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
+                       <chainedmapper>\r
+                               <flattenmapper/>\r
+                               <mapper type="glob" from="*.cpp" to="*.o"/>\r
+                       </chainedmapper>\r
+               </apply>\r
+               <apply failonerror="true" executable="${gcc}" dest="${buildDir}" verbose="true">\r
+                       <arg line="${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
+                       <chainedmapper>\r
+                               <flattenmapper/>\r
+                               <mapper type="glob" from="*.c" to="*.o"/>\r
+                       </chainedmapper>\r
+               </apply>\r
+       </target>       \r
+\r
+       <!-- links the shared library based on the previously compiled object files --> \r
+       <target name="link" depends="compile">\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
+       </target>       \r
+</project>\r
index f8ad57e..5ff4de8 100644 (file)
@@ -1,46 +1,27 @@
 <project name="bullet-natives" basedir="." default="all">
        <target name="clean">
-               <ant antfile="build-win32.xml" target="clean"/>
-               <ant antfile="build-win64.xml" target="clean"/>
-               <ant antfile="build-lin32.xml" target="clean"/>
-               <ant antfile="build-lin64.xml" target="clean"/>
-               <ant antfile="build-android.xml" target="clean"/>
+               <ant antfile="build-windows32.xml" target="clean"/>
+               <ant antfile="build-windows64.xml" target="clean"/>
+               <ant antfile="build-linux32.xml" target="clean"/>
+               <ant antfile="build-linux64.xml" target="clean"/>
+               <ant antfile="build-android32.xml" target="clean"/>
+
        </target>
        
        <target name="compile-natives">
-               <ant antfile="build-win32.xml"/>
-               <ant antfile="build-win64.xml"/>
-               <ant antfile="build-lin32.xml"/>
-               <ant antfile="build-lin64.xml"/>
-               <ant antfile="build-android.xml"/>
+               <ant antfile="build-windows32.xml"/>
+               <ant antfile="build-windows64.xml"/>
+               <ant antfile="build-linux32.xml"/>
+               <ant antfile="build-linux64.xml"/>
+               <ant antfile="build-android32.xml"/>
 
-               <jar destfile="../libs/bullet-natives.jar">
-                       <fileset dir="../libs/windows" includes="bullet.dll"/>
-                       <fileset dir="../libs/windows64" includes="bullet-64.dll"/>
-                       <fileset dir="../libs/linux" includes="libbullet.so"/>
-                       <fileset dir="../libs/linux64" includes="libbullet-64.so"/>
-                       <fileset dir="../libs/mac" includes="libbullet.dylib"/>
-               </jar>
        </target>
        
        <target name="pack-natives">
-                       <jar destfile="../libs/bullet-natives.jar">
-                       <fileset dir="../libs/windows" includes="bullet.dll"/>
-                       <fileset dir="../libs/windows64" includes="bullet-64.dll"/>
-                       <fileset dir="../libs/linux" includes="libbullet.so"/>
-                       <fileset dir="../libs/linux64" includes="libbullet-64.so"/>
-                       <fileset dir="../libs/mac" includes="libbullet.dylib"/>
+               <jar destfile="../libs/bullet-natives.jar">
+                       <fileset dir="../libs/windows32" includes="bullet.dll"/>                        <fileset dir="../libs/windows64" includes="bullet64.dll"/>                      <fileset dir="../libs/linux32" includes="libbullet.so"/>                        <fileset dir="../libs/linux64" includes="libbullet64.so"/>                      <fileset dir="../libs/android32" includes="libbullet.so"/>
                </jar>
        </target>
-       
-       <target name="update-natives" depends="pack-natives">           
-               <!-- <copy tofile="../../tests/gdx-tests-android/libs/armeabi/libgdx.so" file="../libs/armeabi/libgdx.so" />
-               <copy tofile="tests/gdx-tests-android/libs/armeabi/libmpg123.so" file="../libs/armeabi/libmpg123.so" />
-               <copy tofile="../../tests/gdx-tests-android/libs/armeabi/libandroidgl20.so" file="../dist/armeabi/libandroidgl20.so" />
-               <copy tofile="../../tests/gdx-tests-android/libs/armeabi-v7a/libgdx.so" file="../libs/armeabi-v7a/libgdx.so" />
-               <copy tofile="tests/gdx-tests-android/libs/armeabi-v7a/libmpg123.so" file="../libs/armeabi-v7a/libmpg123.so" />
-               <copy tofile="../../tests/gdx-tests-android/libs/armeabi-v7a/libandroidgl20.so" file="../dist/armeabi/libandroidgl20.so" />     -->
-       </target>
 
-       <target name="all" depends="compile-natives,update-natives"/>
+       <target name="all" depends="compile-natives,pack-natives"/>
 </project>
diff --git a/extensions/bullet/bullet/libs/windows32/bullet.dll b/extensions/bullet/bullet/libs/windows32/bullet.dll
new file mode 100644 (file)
index 0000000..d6dbd62
Binary files /dev/null and b/extensions/bullet/bullet/libs/windows32/bullet.dll differ
index e0bb074..14042d6 100644 (file)
@@ -1,9 +1,56 @@
 package com.badlogic.gdx.physics.bullet;\r
 \r
+import com.badlogic.gdx.jnigen.AntScriptGenerator;\r
+import com.badlogic.gdx.jnigen.BuildConfig;\r
+import com.badlogic.gdx.jnigen.BuildExecutor;\r
+import com.badlogic.gdx.jnigen.BuildTarget;\r
 import com.badlogic.gdx.jnigen.NativeCodeGenerator;\r
+import com.badlogic.gdx.jnigen.BuildTarget.TargetOs;\r
 \r
 public class BulletBuild {\r
        public static void main(String[] args) throws Exception {\r
-               new NativeCodeGenerator().generate("src/", "bin/", "jni/");\r
+               // generate C/C++ code\r
+               new NativeCodeGenerator().generate("src", "bin", "jni");\r
+\r
+               // generate build scripts, for win32 only\r
+               // custom target for testing purposes\r
+               String[] excludes = { "src/BulletMultiThreaded/GpuSoftBodySolvers/**" };\r
+               String[] headers = { "src/" };\r
+               \r
+               BuildTarget win32home = BuildTarget.newDefaultTarget(TargetOs.Windows, false);\r
+               win32home.compilerPrefix = "";\r
+               win32home.buildFileName = "build-windows32home.xml";\r
+               win32home.excludeFromMasterBuildFile = true;\r
+               win32home.cExcludes = win32home.cppExcludes = excludes;\r
+               win32home.headerDirs = headers;\r
+               \r
+               BuildTarget win32 = BuildTarget.newDefaultTarget(TargetOs.Windows, false);\r
+               win32.cExcludes = win32.cppExcludes = excludes;\r
+               win32.headerDirs = headers;\r
+               \r
+               BuildTarget win64 = BuildTarget.newDefaultTarget(TargetOs.Windows, true);\r
+               win64.cExcludes = win64.cppExcludes = excludes;\r
+               win64.headerDirs = headers;\r
+               \r
+               BuildTarget lin32 = BuildTarget.newDefaultTarget(TargetOs.Linux, false);\r
+               lin32.cExcludes = lin32.cppExcludes = excludes;\r
+               lin32.headerDirs = headers;\r
+               \r
+               BuildTarget lin64 = BuildTarget.newDefaultTarget(TargetOs.Linux, true);\r
+               lin64.cExcludes = lin64.cppExcludes = excludes;\r
+               lin64.headerDirs = headers;\r
+               \r
+               BuildTarget mac = BuildTarget.newDefaultTarget(TargetOs.MacOsX, false);\r
+               mac.cExcludes = mac.cppExcludes = excludes;\r
+               mac.headerDirs = headers;\r
+               \r
+               BuildTarget android = BuildTarget.newDefaultTarget(TargetOs.Android, false);\r
+               android.cExcludes = android.cppExcludes = excludes;\r
+               android.headerDirs = headers;\r
+               \r
+               new AntScriptGenerator().generate(new BuildConfig("bullet"), win32home, win32, win64, lin32, lin64, mac, android);\r
+\r
+               // build natives\r
+               BuildExecutor.executeAnt("jni/build-windows32home.xml", "-v");\r
        }\r
 }\r
index 01abedf..f319bbe 100644 (file)
@@ -18,10 +18,13 @@ public class AndroidNdkScriptGenerator {
                }\r
                \r
                ArrayList<FileDescriptor> files = new ArrayList<FileDescriptor>();\r
-               String[] includes = new String[target.cIncludes.length + target.cppIncludes.length];\r
+\r
                int idx = 0;\r
+               String[] includes = new String[target.cIncludes.length + target.cppIncludes.length];\r
                for(String include: target.cIncludes) includes[idx++] = include;\r
                for(String include: target.cppIncludes) includes[idx++] = include;\r
+               \r
+               idx = 0;\r
                String[] excludes = new String[target.cExcludes.length + target.cppExcludes.length];\r
                for(String exclude: target.cExcludes) excludes[idx++] = exclude;\r
                for(String exclude: target.cppExcludes) excludes[idx++] = exclude;\r
index 30ece60..d10531b 100644 (file)
@@ -126,7 +126,7 @@ public class AntScriptGenerator {
                // generate C/C++ header directories\r
                StringBuffer headerDirs = new StringBuffer();\r
                for(String headerDir: target.headerDirs) {\r
-                       headerDirs.append("\t\t\t<arg value=\"" + headerDir + "\"/>\n");\r
+                       headerDirs.append("\t\t\t<arg value=\"-I" + headerDir + "\"/>\n");\r
                }\r
                \r
                // replace template vars with proper values\r