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

issue #4729: Android build works ok.

This commit is contained in:
James Chen 2014-04-09 22:30:49 +08:00
parent a240c7b240
commit 9d8d256bee
45 changed files with 62 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/2d/Android.mk
View File

@ -70,7 +70,6 @@ CCMenu.cpp \
CCMenuItem.cpp \
CCMotionStreak.cpp \
CCNode.cpp \
CCNotificationCenter.cpp \
CCParallaxNode.cpp \
CCParticleBatchNode.cpp \
CCParticleExamples.cpp \
@ -142,6 +141,7 @@ renderer/CCRenderMaterial.cpp \
../deprecated/CCString.cpp \
../deprecated/CCDictionary.cpp \
../deprecated/CCDeprecated.cpp \
../deprecated/CCNotificationCenter.cpp \
../math/kazmath/kazmath/aabb.c \
../math/kazmath/kazmath/mat3.c \
../math/kazmath/kazmath/mat4.c \

2
cocos/2d/CCAction.cpp
View File

@ -29,7 +29,7 @@ THE SOFTWARE.
#include "CCActionInterval.h"
#include "CCNode.h"
#include "CCDirector.h"
#include "CCString.h"
#include "deprecated/CCString.h"
NS_CC_BEGIN
//

1
cocos/2d/CCAnimation.h
View File

@ -29,7 +29,6 @@ THE SOFTWARE.
#include "CCPlatformConfig.h"
#include "CCRef.h"
#include "CCArray.h"
#include "CCValue.h"
#include "CCGeometry.h"
#include "CCSpriteFrame.h"

2
cocos/2d/CCAnimationCache.cpp
View File

@ -29,7 +29,7 @@ THE SOFTWARE.
#include "CCAnimation.h"
#include "CCSpriteFrame.h"
#include "CCSpriteFrameCache.h"
#include "CCString.h"
#include "deprecated/CCString.h"
#include "platform/CCFileUtils.h"
using namespace std;

1
cocos/2d/CCConfiguration.h
View File

@ -29,7 +29,6 @@ THE SOFTWARE.
#include "CCRef.h"
#include "CCGL.h"
#include "CCString.h"
#include "CCValue.h"
#include <string>

2
cocos/2d/CCFontFNT.cpp
View File

@ -29,7 +29,7 @@
#include "CCDirector.h"
#include "CCFontAtlas.h"
#include "CCMap.h"
#include "CCString.h"
#include "deprecated/CCString.h"
#include "CCTextureCache.h"
#include "ccUTF8.h"
#include "platform/CCFileUtils.h"

2
cocos/2d/CCGLProgram.cpp
View File

@ -32,7 +32,7 @@ THE SOFTWARE.
#include "ccMacros.h"
#include "platform/CCFileUtils.h"
#include "uthash.h"
#include "CCString.h"
#include "deprecated/CCString.h"
// extern
#include "kazmath/GL/matrix.h"
#include "kazmath/kazmath.h"

1
cocos/2d/CCLabel.cpp
View File

@ -38,6 +38,7 @@
#include "CCEventType.h"
#include "CCEventCustom.h"
#include "platform/CCFileUtils.h"
#include "deprecated/CCString.h"
NS_CC_BEGIN

2
cocos/2d/CCLabelAtlas.cpp
View File

@ -38,7 +38,7 @@ THE SOFTWARE.
#include "platform/CCFileUtils.h"
// external
#include "kazmath/GL/matrix.h"
#include "CCString.h"
#include "deprecated/CCString.h"
NS_CC_BEGIN

2
cocos/2d/CCLabelBMFont.cpp
View File

@ -33,7 +33,7 @@ http://www.angelcode.com/products/bmfont/ (Free, Windows only)
****************************************************************************/
#include "CCLabelBMFont.h"
#include "CCDrawingPrimitives.h"
#include "CCString.h"
#include "deprecated/CCString.h"
#include "CCSprite.h"
using namespace std;

2
cocos/2d/CCLabelTTF.cpp
View File

@ -25,7 +25,7 @@ THE SOFTWARE.
****************************************************************************/
#include "CCLabelTTF.h"
#include "CCLabel.h"
#include "CCString.h"
#include "deprecated/CCString.h"
NS_CC_BEGIN

2
cocos/2d/CCLayer.cpp
View File

@ -46,7 +46,7 @@ THE SOFTWARE.
#include "CCScene.h"
#include "renderer/CCCustomCommand.h"
#include "renderer/CCRenderer.h"
#include "CCString.h"
#include "deprecated/CCString.h"
NS_CC_BEGIN

7
cocos/2d/CCLayer.h
View File

@ -45,6 +45,7 @@ NS_CC_BEGIN
* @{
*/
class __Set;
class TouchScriptHandlerEntry;
class EventListenerTouch;
@ -77,10 +78,10 @@ public:
CC_DEPRECATED_ATTRIBUTE virtual void ccTouchesEnded(__Set *pTouches, Event *pEvent) final {CC_UNUSED_PARAM(pTouches); CC_UNUSED_PARAM(pEvent);}
CC_DEPRECATED_ATTRIBUTE virtual void ccTouchesCancelled(__Set *pTouches, Event *pEvent) final {CC_UNUSED_PARAM(pTouches); CC_UNUSED_PARAM(pEvent);}
/* Callback function should not be deprecated, it will generate lots of warnings.
Since 'setTouchEnabled' was deprecated, it will make warnings if developer overrides onTouchXXX and invokes setTouchEnabled(true) instead of using EventDispatcher::addEventListenerWithXXX.
/* Callback function should not be deprecated, it will generate lots of warnings.
Since 'setTouchEnabled' was deprecated, it will make warnings if developer overrides onTouchXXX and invokes setTouchEnabled(true) instead of using EventDispatcher::addEventListenerWithXXX.
*/
virtual bool onTouchBegan(Touch *touch, Event *unused_event);
virtual bool onTouchBegan(Touch *touch, Event *unused_event);
virtual void onTouchMoved(Touch *touch, Event *unused_event);
virtual void onTouchEnded(Touch *touch, Event *unused_event);
virtual void onTouchCancelled(Touch *touch, Event *unused_event);

2
cocos/2d/CCMenu.cpp
View File

@ -30,7 +30,7 @@ THE SOFTWARE.
#include "CCStdC.h"
#include "CCInteger.h"
#include "CCEventListenerTouch.h"
#include "CCString.h"
#include "deprecated/CCString.h"
#include <vector>
#include <stdarg.h>

1
cocos/2d/CCMenuItem.cpp
View File

@ -31,6 +31,7 @@ THE SOFTWARE.
#include "CCLabelAtlas.h"
#include "CCLabel.h"
#include "CCScriptSupport.h"
#include "deprecated/CCString.h"
#include <stdarg.h>
#include <cstring>

1
cocos/2d/CCMenuItem.h
View File

@ -34,7 +34,6 @@ THE SOFTWARE.
// cocos2d includes
#include "CCNode.h"
#include "CCProtocols.h"
#include "CCArray.h"
NS_CC_BEGIN

2
cocos/2d/CCNode.cpp
View File

@ -30,7 +30,7 @@ THE SOFTWARE.
#include <algorithm>
#include "CCString.h"
#include "deprecated/CCString.h"
#include "ccCArray.h"
#include "TransformUtils.h"
#include "CCGrid.h"

2
cocos/2d/CCParticleSystem.h
View File

@ -30,7 +30,7 @@ THE SOFTWARE.
#include "CCProtocols.h"
#include "CCNode.h"
#include "CCValue.h"
#include "CCString.h"
#include "deprecated/CCString.h"
NS_CC_BEGIN

1
cocos/2d/CCScene.cpp
View File

@ -31,6 +31,7 @@ THE SOFTWARE.
#include "CCSprite.h"
#include "CCSpriteBatchNode.h"
#include "CCPhysicsWorld.h"
#include "deprecated/CCString.h"
NS_CC_BEGIN

1
cocos/2d/CCScriptSupport.h
View File

@ -33,7 +33,6 @@
#include "CCTouch.h"
#include "CCEventTouch.h"
#include "CCEventKeyboard.h"
#include "CCSet.h"
#include <map>
#include <string>
#include <list>

10
cocos/2d/CCSprite.cpp
View File

@ -24,14 +24,11 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#include "CCSprite.h"
#include "CCSpriteBatchNode.h"
#include <string.h>
#include <algorithm>
#include "CCAnimation.h"
#include "CCAnimationCache.h"
#include "ccConfig.h"
#include "CCSprite.h"
#include "CCSpriteFrame.h"
#include "CCSpriteFrameCache.h"
#include "CCTextureCache.h"
@ -52,9 +49,10 @@ THE SOFTWARE.
// external
#include "kazmath/GL/matrix.h"
#include "kazmath/kazmath.h"
#include "deprecated/CCString.h"
using namespace std;
#include <string.h>
#include <algorithm>
NS_CC_BEGIN

1
cocos/2d/CCSprite.h
View File

@ -32,7 +32,6 @@ THE SOFTWARE.
#include "CCProtocols.h"
#include "CCTextureAtlas.h"
#include "ccTypes.h"
#include "CCDictionary.h"
#include <string>
#ifdef EMSCRIPTEN
#include "CCGLBufferedNode.h"

7
cocos/2d/CCSpriteBatchNode.cpp
View File

@ -27,9 +27,6 @@ THE SOFTWARE.
****************************************************************************/
#include "CCSpriteBatchNode.h"
#include <algorithm>
#include "ccConfig.h"
#include "CCSprite.h"
#include "CCGrid.h"
@ -48,6 +45,10 @@ THE SOFTWARE.
// external
#include "kazmath/GL/matrix.h"
#include "deprecated/CCString.h" // For StringUtils::format
#include <algorithm>
NS_CC_BEGIN
/*

2
cocos/2d/CCSpriteFrameCache.cpp
View File

@ -35,7 +35,7 @@ THE SOFTWARE.
#include "CCSprite.h"
#include "TransformUtils.h"
#include "platform/CCFileUtils.h"
#include "CCString.h"
#include "deprecated/CCString.h"
#include "CCArray.h"
#include "CCDictionary.h"
#include "CCDirector.h"

2
cocos/2d/CCTMXLayer.cpp
View File

@ -34,6 +34,8 @@ THE SOFTWARE.
#include "ccCArray.h"
#include "CCDirector.h"
#include "deprecated/CCString.h" // For StringUtils::format
NS_CC_BEGIN

2
cocos/2d/CCTMXTiledMap.cpp
View File

@ -28,6 +28,8 @@ THE SOFTWARE.
#include "CCTMXXMLParser.h"
#include "CCTMXLayer.h"
#include "CCSprite.h"
#include "deprecated/CCString.h" // For StringUtils::format
#include <algorithm>
NS_CC_BEGIN

1
cocos/2d/CCTexture2D.cpp
View File

@ -44,6 +44,7 @@ THE SOFTWARE.
#include "ccGLStateCache.h"
#include "CCShaderCache.h"
#include "platform/CCDevice.h"
#include "deprecated/CCString.h"
#if CC_ENABLE_CACHE_TEXTURE_DATA
#include "CCTextureCache.h"

2
cocos/2d/CCTextureAtlas.cpp
View File

@ -39,7 +39,7 @@ THE SOFTWARE.
// support
#include "CCTexture2D.h"
#include "CCString.h"
#include "deprecated/CCString.h"
#include <stdlib.h>
#include "CCEventDispatcher.h"
#include "CCEventListenerCustom.h"

2
cocos/2d/CCTextureCache.cpp
View File

@ -37,7 +37,7 @@ THE SOFTWARE.
#include "platform/CCFileUtils.h"
#include "ccUtils.h"
#include "CCScheduler.h"
#include "CCString.h"
#include "deprecated/CCString.h"
#ifdef EMSCRIPTEN

2
cocos/2d/CCTileMapAtlas.cpp
View File

@ -31,7 +31,7 @@ THE SOFTWARE.
#include "ccConfig.h"
#include "CCInteger.h"
#include "CCDirector.h"
#include "CCString.h"
#include "deprecated/CCString.h"
#include <sstream>
NS_CC_BEGIN

2
cocos/2d/CMakeLists.txt
View File

@ -103,7 +103,6 @@ set(COCOS2D_SRC
base64.cpp
ccUtils.cpp
CCVertex.cpp
CCNotificationCenter.cpp
TGAlib.cpp
ZipUtils.cpp
ccCArray.cpp
@ -145,6 +144,7 @@ set(COCOS2D_SRC
renderer/CCRenderer.cpp
renderer/CCRenderMaterial.cpp
../deprecated/CCDeprecated.cpp
../deprecated/CCNotificationCenter.cpp
../../external/edtaa3func/edtaa3func.cpp
)

20
cocos/2d/cocos2d.h
View File

@ -59,19 +59,11 @@ THE SOFTWARE.
// cocoa
#include "CCAffineTransform.h"
#include "CCDictionary.h"
#include "CCRef.h"
#include "CCArray.h"
#include "CCVector.h"
#include "CCMap.h"
#include "CCGeometry.h"
#include "CCSet.h"
#include "CCAutoreleasePool.h"
#include "CCInteger.h"
#include "CCFloat.h"
#include "CCDouble.h"
#include "CCBool.h"
#include "CCString.h"
#include "CCNS.h"
#include "CCData.h"
#include "CCValue.h"
@ -230,7 +222,6 @@ THE SOFTWARE.
// support
#include "ccUTF8.h"
#include "CCNotificationCenter.h"
#include "CCProfiling.h"
#include "CCConsole.h"
#include "CCUserDefault.h"
@ -277,8 +268,19 @@ THE SOFTWARE.
#include "CCComponentContainer.h"
// Deprecated include
#include "deprecated/CCDictionary.h"
#include "deprecated/CCArray.h"
#include "deprecated/CCSet.h"
#include "deprecated/CCInteger.h"
#include "deprecated/CCFloat.h"
#include "deprecated/CCDouble.h"
#include "deprecated/CCBool.h"
#include "deprecated/CCString.h"
#include "deprecated/CCNotificationCenter.h"
// CCDeprecated.h must be included at the end
#include "deprecated/CCDeprecated.h"
NS_CC_BEGIN
CC_DLL const char* cocos2dVersion();

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

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

1
cocos/2d/platform/android/CCGLView.cpp
View File

@ -27,7 +27,6 @@ THE SOFTWARE.
#if CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID
#include "CCGLView.h"
#include "CCSet.h"
#include "CCDirector.h"
#include "ccMacros.h"
#include "jni/IMEJni.h"

2
cocos/2d/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp
View File

@ -29,7 +29,7 @@ THE SOFTWARE.
#include "JniHelper.h"
#include "CCFileUtilsAndroid.h"
#include "android/asset_manager_jni.h"
#include "CCString.h"
#include "deprecated/CCString.h"
#include "Java_org_cocos2dx_lib_Cocos2dxHelper.h"
#define LOG_TAG "Java_org_cocos2dx_lib_Cocos2dxHelper.cpp"

1
cocos/2d/platform/android/jni/TouchesJni.cpp
View File

@ -21,7 +21,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#include "CCSet.h"
#include "CCDirector.h"
#include "CCEventKeyboard.h"
#include "CCGLView.h"

2
cocos/2d/platform/apple/CCFileUtilsApple.mm
View File

@ -27,7 +27,7 @@ THE SOFTWARE.
#include <string>
#include <stack>
#include "CCString.h"
#include "deprecated/CCString.h"
#include "CCFileUtils.h"
#include "CCDirector.h"
#include "CCSAXParser.h"

2
cocos/2d/platform/linux/CCFileUtilsLinux.cpp
View File

@ -30,7 +30,7 @@ THE SOFTWARE.
#include "platform/CCCommon.h"
#include "ccMacros.h"
#include "CCApplication.h"
#include "CCString.h"
#include "deprecated/CCString.h"
#include <unistd.h>
#include <sys/stat.h>
#include <stdio.h>

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

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

6
cocos/audio/android/ccdandroidUtils.cpp
View File

@ -39,9 +39,9 @@ namespace CocosDenshion {
// Removing `assets` since it isn't needed for the API of playing sound.
size_t pos = fullPath.find("assets/");
if (pos == 0)
{
fullPath = fullPath.substr(strlen("assets/"));
}
{
fullPath = fullPath.substr(strlen("assets/"));
}
return fullPath;
}
}

2
cocos/base/CCDataVisitor.cpp
View File

@ -27,7 +27,7 @@
#include "CCInteger.h"
#include "CCFloat.h"
#include "CCDouble.h"
#include "CCString.h"
#include "deprecated/CCString.h"
#include "CCArray.h"
#include "CCDictionary.h"
#include "CCSet.h"

2
cocos/deprecated/CCArray.cpp
View File

@ -25,7 +25,7 @@ THE SOFTWARE.
****************************************************************************/
#include "CCArray.h"
#include "CCString.h"
#include "deprecated/CCString.h"
#include "platform/CCFileUtils.h"
NS_CC_BEGIN

4
cocos/deprecated/CCDictionary.cpp
View File

@ -24,10 +24,10 @@
****************************************************************************/
#include "CCDictionary.h"
#include "CCString.h"
#include "deprecated/CCString.h"
#include "CCInteger.h"
#include "platform/CCFileUtils.h"
#include "CCString.h"
#include "deprecated/CCString.h"
#include "CCBool.h"
#include "CCInteger.h"
#include "CCFloat.h"

2
cocos/deprecated/CCDictionary.h
View File

@ -29,7 +29,7 @@ THE SOFTWARE.
#include "uthash.h"
#include "CCRef.h"
#include "CCArray.h"
#include "CCString.h"
#include "deprecated/CCString.h"
NS_CC_BEGIN

2
cocos/deprecated/CCString.cpp
View File

@ -23,7 +23,7 @@ Copyright (c) 2013-2014 Chukong Technologies
THE SOFTWARE.
****************************************************************************/
#include "CCString.h"
#include "deprecated/CCString.h"
#include "platform/CCFileUtils.h"
#include "ccMacros.h"
#include <stdlib.h>