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

Merge pull request #10157 from dabingnn/v3_fixandroidCrashWithoutneon 

only mathUtil.cpp compiles with neon
This commit is contained in:
minggo 2015-01-21 20:23:20 +08:00
parent 954f372775 daa6d47b40
commit a0091058f6
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cocos/Android.mk
View File

@ -6,6 +6,12 @@ LOCAL_MODULE := cocos2dx_internal_static
LOCAL_MODULE_FILENAME := libcocos2dxinternal LOCAL_MODULE_FILENAME := libcocos2dxinternal
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
MATHNEONFILE := math/MathUtil.cpp.neon
else
MATHNEONFILE := math/MathUtil.cpp
endif
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
cocos2d.cpp \ cocos2d.cpp \
2d/CCAction.cpp \ 2d/CCAction.cpp \
@ -87,8 +93,8 @@ platform/CCImage.cpp \
math/CCAffineTransform.cpp \ math/CCAffineTransform.cpp \
math/CCGeometry.cpp \ math/CCGeometry.cpp \
math/CCVertex.cpp \ math/CCVertex.cpp \
$(MATHNEONFILE) \
math/Mat4.cpp \ math/Mat4.cpp \
math/MathUtil.cpp \
math/Quaternion.cpp \ math/Quaternion.cpp \
math/TransformUtils.cpp \ math/TransformUtils.cpp \
math/Vec2.cpp \ math/Vec2.cpp \
@ -233,10 +239,6 @@ LOCAL_CPPFLAGS := -Wno-deprecated-declarations -Wno-extern-c-compat
LOCAL_EXPORT_CFLAGS := -DUSE_FILE32API LOCAL_EXPORT_CFLAGS := -DUSE_FILE32API
LOCAL_EXPORT_CPPFLAGS := -Wno-deprecated-declarations -Wno-extern-c-compat LOCAL_EXPORT_CPPFLAGS := -Wno-deprecated-declarations -Wno-extern-c-compat
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
LOCAL_ARM_NEON := true
endif
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)
#============================================================== #==============================================================