modify gitignore

.gitignore

@@ -1,3 +1,3 @@
-/Box2D/obj/
+Box2D/Android/obj/
 /Box2D/libBox2D.a
 /Box2D/build/

Box2D/Android/jni/Android.mk

@@ -7,55 +7,55 @@ LOCAL_MODULE := box2d
 LOCAL_MODULE_FILENAME := libbox2d
 
 LOCAL_SRC_FILES := \
-../../Collision/b2BroadPhase.cpp \
-../../Collision/b2CollideCircle.cpp \
-../../Collision/b2CollideEdge.cpp \
-../../Collision/b2CollidePolygon.cpp \
-../../Collision/b2Collision.cpp \
-../../Collision/b2Distance.cpp \
-../../Collision/b2DynamicTree.cpp \
-../../Collision/b2TimeOfImpact.cpp \
-../../Collision/Shapes/b2ChainShape.cpp \
-../../Collision/Shapes/b2CircleShape.cpp \
-../../Collision/Shapes/b2EdgeShape.cpp \
-../../Collision/Shapes/b2PolygonShape.cpp \
-../../Common/b2BlockAllocator.cpp \
-../../Common/b2Draw.cpp \
-../../Common/b2Math.cpp \
-../../Common/b2Settings.cpp \
-../../Common/b2StackAllocator.cpp \
-../../Common/b2Timer.cpp \
-../../Dynamics/b2Body.cpp \
-../../Dynamics/b2ContactManager.cpp \
-../../Dynamics/b2Fixture.cpp \
-../../Dynamics/b2Island.cpp \
-../../Dynamics/b2World.cpp \
-../../Dynamics/b2WorldCallbacks.cpp \
-../../Dynamics/Contacts/b2ChainAndCircleContact.cpp \
-../../Dynamics/Contacts/b2ChainAndPolygonContact.cpp \
-../../Dynamics/Contacts/b2CircleContact.cpp \
-../../Dynamics/Contacts/b2Contact.cpp \
-../../Dynamics/Contacts/b2ContactSolver.cpp \
-../../Dynamics/Contacts/b2EdgeAndCircleContact.cpp \
-../../Dynamics/Contacts/b2EdgeAndPolygonContact.cpp \
-../../Dynamics/Contacts/b2PolygonAndCircleContact.cpp \
-../../Dynamics/Contacts/b2PolygonContact.cpp \
-../../Dynamics/Joints/b2DistanceJoint.cpp \
-../../Dynamics/Joints/b2FrictionJoint.cpp \
-../../Dynamics/Joints/b2GearJoint.cpp \
-../../Dynamics/Joints/b2Joint.cpp \
-../../Dynamics/Joints/b2MotorJoint.cpp \
-../../Dynamics/Joints/b2MouseJoint.cpp \
-../../Dynamics/Joints/b2PrismaticJoint.cpp \
-../../Dynamics/Joints/b2PulleyJoint.cpp \
-../../Dynamics/Joints/b2RevoluteJoint.cpp \
-../../Dynamics/Joints/b2RopeJoint.cpp \
-../../Dynamics/Joints/b2WeldJoint.cpp \
-../../Dynamics/Joints/b2WheelJoint.cpp \
-../../Rope/b2Rope.cpp
+../../Box2D/Collision/b2BroadPhase.cpp \
+../../Box2D/Collision/b2CollideCircle.cpp \
+../../Box2D/Collision/b2CollideEdge.cpp \
+../../Box2D/Collision/b2CollidePolygon.cpp \
+../../Box2D/Collision/b2Collision.cpp \
+../../Box2D/Collision/b2Distance.cpp \
+../../Box2D/Collision/b2DynamicTree.cpp \
+../../Box2D/Collision/b2TimeOfImpact.cpp \
+../../Box2D/Collision/Shapes/b2ChainShape.cpp \
+../../Box2D/Collision/Shapes/b2CircleShape.cpp \
+../../Box2D/Collision/Shapes/b2EdgeShape.cpp \
+../../Box2D/Collision/Shapes/b2PolygonShape.cpp \
+../../Box2D/Common/b2BlockAllocator.cpp \
+../../Box2D/Common/b2Draw.cpp \
+../../Box2D/Common/b2Math.cpp \
+../../Box2D/Common/b2Settings.cpp \
+../../Box2D/Common/b2StackAllocator.cpp \
+../../Box2D/Common/b2Timer.cpp \
+../../Box2D/Dynamics/b2Body.cpp \
+../../Box2D/Dynamics/b2ContactManager.cpp \
+../../Box2D/Dynamics/b2Fixture.cpp \
+../../Box2D/Dynamics/b2Island.cpp \
+../../Box2D/Dynamics/b2World.cpp \
+../../Box2D/Dynamics/b2WorldCallbacks.cpp \
+../../Box2D/Dynamics/Contacts/b2ChainAndCircleContact.cpp \
+../../Box2D/Dynamics/Contacts/b2ChainAndPolygonContact.cpp \
+../../Box2D/Dynamics/Contacts/b2CircleContact.cpp \
+../../Box2D/Dynamics/Contacts/b2Contact.cpp \
+../../Box2D/Dynamics/Contacts/b2ContactSolver.cpp \
+../../Box2D/Dynamics/Contacts/b2EdgeAndCircleContact.cpp \
+../../Box2D/Dynamics/Contacts/b2EdgeAndPolygonContact.cpp \
+../../Box2D/Dynamics/Contacts/b2PolygonAndCircleContact.cpp \
+../../Box2D/Dynamics/Contacts/b2PolygonContact.cpp \
+../../Box2D/Dynamics/Joints/b2DistanceJoint.cpp \
+../../Box2D/Dynamics/Joints/b2FrictionJoint.cpp \
+../../Box2D/Dynamics/Joints/b2GearJoint.cpp \
+../../Box2D/Dynamics/Joints/b2Joint.cpp \
+../../Box2D/Dynamics/Joints/b2MotorJoint.cpp \
+../../Box2D/Dynamics/Joints/b2MouseJoint.cpp \
+../../Box2D/Dynamics/Joints/b2PrismaticJoint.cpp \
+../../Box2D/Dynamics/Joints/b2PulleyJoint.cpp \
+../../Box2D/Dynamics/Joints/b2RevoluteJoint.cpp \
+../../Box2D/Dynamics/Joints/b2RopeJoint.cpp \
+../../Box2D/Dynamics/Joints/b2WeldJoint.cpp \
+../../Box2D/Dynamics/Joints/b2WheelJoint.cpp \
+../../Box2D/Rope/b2Rope.cpp
 
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../Box2D
 
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../Box2D
 
 include $(BUILD_STATIC_LIBRARY)