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

Merge pull request #6391 from dabingnn/v3_optimize 

V3 optimize
This commit is contained in:
James Chen 2014-04-28 13:39:15 +08:00
parent 6e0ee08d84 e6f7854225
commit 8538b27385
5 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/2d/Android.mk
View File

@ -167,7 +167,6 @@ renderer/CCRenderMaterial.cpp \
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) \
$(LOCAL_PATH)/.. \
$(LOCAL_PATH)/renderer \
$(LOCAL_PATH)/../math/kazmath \
$(LOCAL_PATH)/../math \
platform/android \
$(LOCAL_PATH)/../physics \
@ -181,7 +180,6 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) \
LOCAL_C_INCLUDES := $(LOCAL_PATH) \
$(LOCAL_PATH)/.. \
$(LOCAL_PATH)/renderer \
$(LOCAL_PATH)/../math/kazmath \
$(LOCAL_PATH)/../math \
$(LOCAL_PATH)/platform/android \
$(LOCAL_PATH)/../physics \

1
cocos/2d/platform/android/Android.mk
View File

@ -28,7 +28,6 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH) \
$(LOCAL_PATH)/../.. \
$(LOCAL_PATH)/../../.. \
$(LOCAL_PATH)/../../../base \
$(LOCAL_PATH)/../../../math/kazmath \
$(LOCAL_PATH)/../../../math \
$(LOCAL_PATH)/../../../physics

1
cocos/audio/android/Android.mk
View File

@ -13,7 +13,6 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../include
LOCAL_C_INCLUDES := $(LOCAL_PATH)/../include \
$(LOCAL_PATH)/../.. \
$(LOCAL_PATH)/../../math/kazmath \
$(LOCAL_PATH)/../../math \
$(LOCAL_PATH)/../../2d \
$(LOCAL_PATH)/../../2d/platform/android \

6
templates/cpp-template-default/CMakeLists.txt
View File

@ -61,7 +61,7 @@ include_directories(
${COCOS2D_ROOT}/cocos/deprecated
${COCOS2D_ROOT}/cocos/physics
${COCOS2D_ROOT}/cocos/editor-support
${COCOS2D_ROOT}/cocos/math/kazmath
${COCOS2D_ROOT}/cocos/math
${COCOS2D_ROOT}/extensions
${COCOS2D_ROOT}/external
${COCOS2D_ROOT}/external/edtaa3func
@ -89,8 +89,8 @@ link_directories(
${COCOS2D_ROOT}/external/linux-specific/fmod/prebuilt/${ARCH_DIR}
)
# kazmath
add_subdirectory(${COCOS2D_ROOT}/cocos/math/kazmath)
# math
add_subdirectory(${COCOS2D_ROOT}/cocos/math)
# chipmunk library
add_subdirectory(${COCOS2D_ROOT}/external/chipmunk/src)

4
templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj
View File

@ -931,7 +931,7 @@
"$(SRCROOT)/../cocos2d/cocos",
"$(SRCROOT)/../cocos2d/cocos/base",
"$(SRCROOT)/../cocos2d/cocos/physics",
"$(SRCROOT)/../cocos2d/cocos/math/kazmath",
"$(SRCROOT)/../cocos2d/cocos/math",
"$(SRCROOT)/../cocos2d/cocos/2d",
"$(SRCROOT)/../cocos2d/cocos/ui",
"$(SRCROOT)/../cocos2d/cocos/network",
@ -959,7 +959,7 @@
"$(SRCROOT)/../cocos2d/cocos",
"$(SRCROOT)/../cocos2d/cocos/base",
"$(SRCROOT)/../cocos2d/cocos/physics",
"$(SRCROOT)/../cocos2d/cocos/math/kazmath",
"$(SRCROOT)/../cocos2d/cocos/math",
"$(SRCROOT)/../cocos2d/cocos/2d",
"$(SRCROOT)/../cocos2d/cocos/ui",
"$(SRCROOT)/../cocos2d/cocos/network",