diff --git a/cocos/Android.mk b/cocos/Android.mk index 3888e6a025..0da2a8f4bb 100644 --- a/cocos/Android.mk +++ b/cocos/Android.mk @@ -6,6 +6,10 @@ LOCAL_MODULE := cocos2dx_internal_static LOCAL_MODULE_FILENAME := libcocos2dxinternal +ifeq ($(USE_ARM_MODE),1) +LOCAL_ARM_MODE := arm +endif + ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) MATHNEONFILE := math/MathUtil.cpp.neon else diff --git a/templates/js-template-default/frameworks/runtime-src/proj.android-studio/app/jni/Application.mk b/templates/js-template-default/frameworks/runtime-src/proj.android-studio/app/jni/Application.mk index cefa839c79..9a598c3c01 100644 --- a/templates/js-template-default/frameworks/runtime-src/proj.android-studio/app/jni/Application.mk +++ b/templates/js-template-default/frameworks/runtime-src/proj.android-studio/app/jni/Application.mk @@ -6,6 +6,8 @@ APP_STL := gnustl_static APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -DCC_ENABLE_BULLET_INTEGRATION=1 -std=c++11 -fsigned-char APP_LDFLAGS := -latomic +USE_ARM_MODE := 1 + ifeq ($(NDK_DEBUG),1) APP_CPPFLAGS += -DCOCOS2D_DEBUG=1 APP_OPTIM := debug diff --git a/templates/js-template-default/frameworks/runtime-src/proj.android/jni/Application.mk b/templates/js-template-default/frameworks/runtime-src/proj.android/jni/Application.mk index cefa839c79..9a598c3c01 100644 --- a/templates/js-template-default/frameworks/runtime-src/proj.android/jni/Application.mk +++ b/templates/js-template-default/frameworks/runtime-src/proj.android/jni/Application.mk @@ -6,6 +6,8 @@ APP_STL := gnustl_static APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -DCC_ENABLE_BULLET_INTEGRATION=1 -std=c++11 -fsigned-char APP_LDFLAGS := -latomic +USE_ARM_MODE := 1 + ifeq ($(NDK_DEBUG),1) APP_CPPFLAGS += -DCOCOS2D_DEBUG=1 APP_OPTIM := debug diff --git a/templates/js-template-runtime/frameworks/runtime-src/proj.android/jni/Application.mk b/templates/js-template-runtime/frameworks/runtime-src/proj.android/jni/Application.mk index 2079fca546..bbbb77dcc5 100644 --- a/templates/js-template-runtime/frameworks/runtime-src/proj.android/jni/Application.mk +++ b/templates/js-template-runtime/frameworks/runtime-src/proj.android/jni/Application.mk @@ -6,6 +6,8 @@ APP_STL := gnustl_static APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -DCC_ENABLE_BULLET_INTEGRATION=1 -std=c++11 -fsigned-char APP_LDFLAGS := -latomic +USE_ARM_MODE := 1 + ifeq ($(NDK_DEBUG),1) APP_CPPFLAGS += -DCOCOS2D_DEBUG=1 APP_OPTIM := debug diff --git a/tests/js-tests/project/proj.android-studio/app/jni/Application.mk b/tests/js-tests/project/proj.android-studio/app/jni/Application.mk index cefa839c79..9a598c3c01 100644 --- a/tests/js-tests/project/proj.android-studio/app/jni/Application.mk +++ b/tests/js-tests/project/proj.android-studio/app/jni/Application.mk @@ -6,6 +6,8 @@ APP_STL := gnustl_static APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -DCC_ENABLE_BULLET_INTEGRATION=1 -std=c++11 -fsigned-char APP_LDFLAGS := -latomic +USE_ARM_MODE := 1 + ifeq ($(NDK_DEBUG),1) APP_CPPFLAGS += -DCOCOS2D_DEBUG=1 APP_OPTIM := debug diff --git a/tests/js-tests/project/proj.android/jni/Application.mk b/tests/js-tests/project/proj.android/jni/Application.mk index cefa839c79..9a598c3c01 100644 --- a/tests/js-tests/project/proj.android/jni/Application.mk +++ b/tests/js-tests/project/proj.android/jni/Application.mk @@ -6,6 +6,8 @@ APP_STL := gnustl_static APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -DCC_ENABLE_BULLET_INTEGRATION=1 -std=c++11 -fsigned-char APP_LDFLAGS := -latomic +USE_ARM_MODE := 1 + ifeq ($(NDK_DEBUG),1) APP_CPPFLAGS += -DCOCOS2D_DEBUG=1 APP_OPTIM := debug