From 70606caa147b50e252d75d03d76cfe3a5dbe590e Mon Sep 17 00:00:00 2001 From: pandamicro Date: Wed, 10 Jun 2015 19:37:52 +0800 Subject: [PATCH] Fix template android compilation issue on physics3d --- cocos/2d/CCSpriteFrameCache.cpp | 2 +- .../frameworks/runtime-src/proj.android/jni/Application.mk | 2 +- .../frameworks/runtime-src/proj.android/jni/Application.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cocos/2d/CCSpriteFrameCache.cpp b/cocos/2d/CCSpriteFrameCache.cpp index 1a656a5a9b..c9d918aa43 100644 --- a/cocos/2d/CCSpriteFrameCache.cpp +++ b/cocos/2d/CCSpriteFrameCache.cpp @@ -338,7 +338,7 @@ void SpriteFrameCache::removeUnusedSpriteFrames() if( spriteFrame->getReferenceCount() == 1 ) { toRemoveFrames.push_back(iter->first); - spriteFrame->getTexture()->removeSpriteFrameCapInset(spriteFrame); + spriteFrame->getTexture()->removeSpriteFrameCapInset(spriteFrame); CCLOG("cocos2d: SpriteFrameCache: removing unused frame: %s", iter->first.c_str()); removed = true; } 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 706af60331..cefa839c79 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 @@ -3,7 +3,7 @@ APP_STL := gnustl_static # Uncomment this line to compile to armeabi-v7a, your application will run faster but support less devices #APP_ABI := armeabi-v7a -APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11 -fsigned-char +APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -DCC_ENABLE_BULLET_INTEGRATION=1 -std=c++11 -fsigned-char APP_LDFLAGS := -latomic ifeq ($(NDK_DEBUG),1) 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 c36a5d06ec..2079fca546 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 @@ -3,7 +3,7 @@ APP_STL := gnustl_static # Uncomment this line to compile to armeabi-v7a, your application will run faster but support less devices #APP_ABI := armeabi-v7a -APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11 -fsigned-char +APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -DCC_ENABLE_BULLET_INTEGRATION=1 -std=c++11 -fsigned-char APP_LDFLAGS := -latomic ifeq ($(NDK_DEBUG),1)