Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3971 from minggo/iss2905-adjust_folder 

issue #2905:simplify Android.mk dependence
This commit is contained in:
minggo 2013-10-17 23:20:15 -07:00
parent 7d588fbaa3 63c13d8eaa
commit e72b8bf76c
7 changed files with 106 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cocos/editor-support/cocosbuilder/Android.mk
View File

@ -39,10 +39,8 @@ $(LOCAL_PATH)/../../..
LOCAL_CFLAGS += -Wno-psabi LOCAL_CFLAGS += -Wno-psabi
LOCAL_EXPORT_CFLAGS += -Wno-psabi LOCAL_EXPORT_CFLAGS += -Wno-psabi
LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static LOCAL_WHOLE_STATIC_LIBRARIES := cocos_extension_static
LOCAL_WHOLE_STATIC_LIBRARIES += cocos_extension_static
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)
$(call import-module,2d)
$(call import-module,extensions) $(call import-module,extensions)

4
cocos/editor-support/cocostudio/Android.mk
View File

@ -43,10 +43,10 @@ CCSSceneReader.cpp \
../../../external/json/json_writer.cpp ../../../external/json/json_writer.cpp
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/.. \ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/.. \
$(LOCAL_PATH)/../../../external/json $(LOCAL_PATH)/../../../external
LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../2d \ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../2d \
$(LOCAL_PATH)/../../../external/json \ $(LOCAL_PATH)/../../../external \
$(LOCAL_PATH)/.. \ $(LOCAL_PATH)/.. \
$(LOCAL_PATH)/../.. \ $(LOCAL_PATH)/../.. \
$(LOCAL_PATH)/../../../external $(LOCAL_PATH)/../../../external

5
cocos/gui/Android.mk
View File

@ -39,11 +39,8 @@ LOCAL_EXPORT_CFLAGS += -Wno-psabi
LOCAL_WHOLE_STATIC_LIBRARIES := cocostudio_static LOCAL_WHOLE_STATIC_LIBRARIES := cocostudio_static
LOCAL_WHOLE_STATIC_LIBRARIES += cocos_extension_static LOCAL_WHOLE_STATIC_LIBRARIES += cocos_extension_static
LOCAL_WHOLE_STATIC_LIBRARIES += cocos2dx_static
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)
$(call import-module,extensions)
$(call import-module,editor-support/cocostudio) $(call import-module,editor-support/cocostudio)
$(call import-module,2d) $(call import-module,extensions)

52
extensions/Android.mk
View File

@ -6,36 +6,35 @@ LOCAL_MODULE := cocos_extension_static
LOCAL_MODULE_FILENAME := libextension LOCAL_MODULE_FILENAME := libextension
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
$(LOCAL_PATH)/assets-manager/AssetsManager.cpp \ assets-manager/AssetsManager.cpp \
$(LOCAL_PATH)/GUI/CCControlExtension/CCControl.cpp \ GUI/CCControlExtension/CCControl.cpp \
$(LOCAL_PATH)/GUI/CCControlExtension/CCControlButton.cpp \ GUI/CCControlExtension/CCControlButton.cpp \
$(LOCAL_PATH)/GUI/CCControlExtension/CCControlColourPicker.cpp \ GUI/CCControlExtension/CCControlColourPicker.cpp \
$(LOCAL_PATH)/GUI/CCControlExtension/CCControlHuePicker.cpp \ GUI/CCControlExtension/CCControlHuePicker.cpp \
$(LOCAL_PATH)/GUI/CCControlExtension/CCControlPotentiometer.cpp \ GUI/CCControlExtension/CCControlPotentiometer.cpp \
$(LOCAL_PATH)/GUI/CCControlExtension/CCControlSaturationBrightnessPicker.cpp \ GUI/CCControlExtension/CCControlSaturationBrightnessPicker.cpp \
$(LOCAL_PATH)/GUI/CCControlExtension/CCControlSlider.cpp \ GUI/CCControlExtension/CCControlSlider.cpp \
$(LOCAL_PATH)/GUI/CCControlExtension/CCControlStepper.cpp \ GUI/CCControlExtension/CCControlStepper.cpp \
$(LOCAL_PATH)/GUI/CCControlExtension/CCControlSwitch.cpp \ GUI/CCControlExtension/CCControlSwitch.cpp \
$(LOCAL_PATH)/GUI/CCControlExtension/CCControlUtils.cpp \ GUI/CCControlExtension/CCControlUtils.cpp \
$(LOCAL_PATH)/GUI/CCControlExtension/CCInvocation.cpp \ GUI/CCControlExtension/CCInvocation.cpp \
$(LOCAL_PATH)/GUI/CCControlExtension/CCScale9Sprite.cpp \ GUI/CCControlExtension/CCScale9Sprite.cpp \
$(LOCAL_PATH)/GUI/CCEditBox/CCEditBox.cpp \ GUI/CCEditBox/CCEditBox.cpp \
$(LOCAL_PATH)/GUI/CCEditBox/CCEditBoxImplAndroid.cpp \ GUI/CCEditBox/CCEditBoxImplAndroid.cpp \
$(LOCAL_PATH)/GUI/CCEditBox/CCEditBoxImplNone.cpp \ GUI/CCEditBox/CCEditBoxImplNone.cpp \
$(LOCAL_PATH)/GUI/CCEditBox/CCEditBoxImplTizen.cpp \ GUI/CCEditBox/CCEditBoxImplTizen.cpp \
$(LOCAL_PATH)/GUI/CCEditBox/CCEditBoxImplWin.cpp \ GUI/CCEditBox/CCEditBoxImplWin.cpp \
$(LOCAL_PATH)/GUI/CCScrollView/CCScrollView.cpp \ GUI/CCScrollView/CCScrollView.cpp \
$(LOCAL_PATH)/GUI/CCScrollView/CCSorting.cpp \ GUI/CCScrollView/CCSorting.cpp \
$(LOCAL_PATH)/GUI/CCScrollView/CCTableView.cpp \ GUI/CCScrollView/CCTableView.cpp \
$(LOCAL_PATH)/GUI/CCScrollView/CCTableViewCell.cpp \ GUI/CCScrollView/CCTableViewCell.cpp \
$(LOCAL_PATH)/physics-nodes/CCPhysicsDebugNode.cpp \ physics-nodes/CCPhysicsDebugNode.cpp \
$(LOCAL_PATH)/physics-nodes/CCPhysicsSprite.cpp physics-nodes/CCPhysicsSprite.cpp
LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static
LOCAL_WHOLE_STATIC_LIBRARIES += cocosdenshion_static LOCAL_WHOLE_STATIC_LIBRARIES += cocosdenshion_static
LOCAL_WHOLE_STATIC_LIBRARIES += cocos_curl_static LOCAL_WHOLE_STATIC_LIBRARIES += cocos_curl_static
LOCAL_WHOLE_STATIC_LIBRARIES += box2d_static LOCAL_WHOLE_STATIC_LIBRARIES += box2d_static
LOCAL_WHOLE_STATIC_LIBRARIES += chipmunk_static
LOCAL_WHOLE_STATIC_LIBRARIES += libwebsockets_static LOCAL_WHOLE_STATIC_LIBRARIES += libwebsockets_static
LOCAL_CXXFLAGS += -fexceptions LOCAL_CXXFLAGS += -fexceptions
@ -53,6 +52,7 @@ include $(BUILD_STATIC_LIBRARY)
$(call import-module,2d) $(call import-module,2d)
$(call import-module,audio/android) $(call import-module,audio/android)
$(call import-module,curl/prebuilt/android)
$(call import-module,Box2D) $(call import-module,Box2D)
$(call import-module,chipmunk)
$(call import-module,websockets/prebuilt/android) $(call import-module,websockets/prebuilt/android)

90
external/Box2D/Android.mk vendored
View File

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

58
external/chipmunk/Android.mk vendored
View File

@ -7,35 +7,35 @@ LOCAL_MODULE := chipmunk_static
LOCAL_MODULE_FILENAME := libchipmunk LOCAL_MODULE_FILENAME := libchipmunk
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
$(LOCAL_PATH)/src/chipmunk.c \ src/chipmunk.c \
$(LOCAL_PATH)/src/cpArbiter.c \ src/cpArbiter.c \
$(LOCAL_PATH)/src/cpArray.c \ src/cpArray.c \
$(LOCAL_PATH)/src/cpBB.c \ src/cpBB.c \
$(LOCAL_PATH)/src/cpBBTree.c \ src/cpBBTree.c \
$(LOCAL_PATH)/src/cpBody.c \ src/cpBody.c \
$(LOCAL_PATH)/src/cpCollision.c \ src/cpCollision.c \
$(LOCAL_PATH)/src/cpHashSet.c \ src/cpHashSet.c \
$(LOCAL_PATH)/src/cpPolyShape.c \ src/cpPolyShape.c \
$(LOCAL_PATH)/src/cpShape.c \ src/cpShape.c \
$(LOCAL_PATH)/src/cpSpace.c \ src/cpSpace.c \
$(LOCAL_PATH)/src/cpSpaceComponent.c \ src/cpSpaceComponent.c \
$(LOCAL_PATH)/src/cpSpaceHash.c \ src/cpSpaceHash.c \
$(LOCAL_PATH)/src/cpSpaceQuery.c \ src/cpSpaceQuery.c \
$(LOCAL_PATH)/src/cpSpaceStep.c \ src/cpSpaceStep.c \
$(LOCAL_PATH)/src/cpSpatialIndex.c \ src/cpSpatialIndex.c \
$(LOCAL_PATH)/src/cpSweep1D.c \ src/cpSweep1D.c \
$(LOCAL_PATH)/src/cpVect.c \ src/cpVect.c \
$(LOCAL_PATH)/src/constraints/cpConstraint.c \ src/constraints/cpConstraint.c \
$(LOCAL_PATH)/src/constraints/cpDampedRotarySpring.c \ src/constraints/cpDampedRotarySpring.c \
$(LOCAL_PATH)/src/constraints/cpDampedSpring.c \ src/constraints/cpDampedSpring.c \
$(LOCAL_PATH)/src/constraints/cpGearJoint.c \ src/constraints/cpGearJoint.c \
$(LOCAL_PATH)/src/constraints/cpGrooveJoint.c \ src/constraints/cpGrooveJoint.c \
$(LOCAL_PATH)/src/constraints/cpPinJoint.c \ src/constraints/cpPinJoint.c \
$(LOCAL_PATH)/src/constraints/cpPivotJoint.c \ src/constraints/cpPivotJoint.c \
$(LOCAL_PATH)/src/constraints/cpRatchetJoint.c \ src/constraints/cpRatchetJoint.c \
$(LOCAL_PATH)/src/constraints/cpRotaryLimitJoint.c \ src/constraints/cpRotaryLimitJoint.c \
$(LOCAL_PATH)/src/constraints/cpSimpleMotor.c \ src/constraints/cpSimpleMotor.c \
$(LOCAL_PATH)/src/constraints/cpSlideJoint.c src/constraints/cpSlideJoint.c
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include/chipmunk LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include/chipmunk

13
samples/Cpp/TestCpp/Android.mk
View File

@ -141,28 +141,19 @@ Classes/ZwoptexTest/ZwoptexTest.cpp
LOCAL_C_INCLUDES := $(LOCAL_PATH)/Classes LOCAL_C_INCLUDES := $(LOCAL_PATH)/Classes
LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static LOCAL_WHOLE_STATIC_LIBRARIES := cocos_extension_static
LOCAL_WHOLE_STATIC_LIBRARIES += cocosdenshion_static
LOCAL_WHOLE_STATIC_LIBRARIES += box2d_static
LOCAL_WHOLE_STATIC_LIBRARIES += chipmunk_static
LOCAL_WHOLE_STATIC_LIBRARIES += cocos_extension_static
LOCAL_WHOLE_STATIC_LIBRARIES += cocosbuilder_static LOCAL_WHOLE_STATIC_LIBRARIES += cocosbuilder_static
LOCAL_WHOLE_STATIC_LIBRARIES += spine_static LOCAL_WHOLE_STATIC_LIBRARIES += spine_static
LOCAL_WHOLE_STATIC_LIBRARIES += cocostudio_static LOCAL_WHOLE_STATIC_LIBRARIES += cocostudio_static
LOCAL_WHOLE_STATIC_LIBRARIES += cocos_network_static LOCAL_WHOLE_STATIC_LIBRARIES += cocos_network_static
LOCAL_WHOLE_STATIC_LIBRARIES += cocos_curl_static
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/Classes LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/Classes
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)
$(call import-module,audio/android)
$(call import-module,Box2D)
$(call import-module,chipmunk)
$(call import-module,2d)
$(call import-module,extensions) $(call import-module,extensions)
$(call import-module,editor-support/cocosbuilder) $(call import-module,editor-support/cocosbuilder)
$(call import-module,editor-support/spine) $(call import-module,editor-support/spine)
$(call import-module,editor-support/cocostudio) $(call import-module,editor-support/cocostudio)
$(call import-module,network) $(call import-module,network)
$(call import-module,curl/prebuilt/android)