From 567f75c31b49bba84c5c54497c8df268562bcaaa Mon Sep 17 00:00:00 2001 From: yinkaile <501251991@qq.com> Date: Sat, 14 Sep 2013 15:52:41 +0800 Subject: [PATCH] upload CCArmatureDefine.cpp --- extensions/Android.mk | 4 --- .../Armature/utils/CCArmatureDefine.cpp | 34 +++++++++++++++++++ 2 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 extensions/CocoStudio/Armature/utils/CCArmatureDefine.cpp diff --git a/extensions/Android.mk b/extensions/Android.mk index b0c6196ec7..34af4f3a73 100644 --- a/extensions/Android.mk +++ b/extensions/Android.mk @@ -69,12 +69,8 @@ CocoStudio/Armature/display/CCBatchNode.cpp \ CocoStudio/Armature/display/CCDecorativeDisplay.cpp \ CocoStudio/Armature/display/CCDisplayFactory.cpp \ CocoStudio/Armature/display/CCDisplayManager.cpp \ -CocoStudio/Armature/display/CCShaderNode.cpp \ CocoStudio/Armature/display/CCSkin.cpp \ -CocoStudio/Armature/external_tool/CCTexture2DMutable.cpp \ -CocoStudio/Armature/external_tool/GLES-Render.cpp \ CocoStudio/Armature/physics/CCColliderDetector.cpp \ -CocoStudio/Armature/physics/CCPhysicsWorld.cpp \ CocoStudio/Armature/utils/CCArmatureDataManager.cpp \ CocoStudio/Armature/utils/CCDataReaderHelper.cpp \ CocoStudio/Armature/utils/CCSpriteFrameCacheHelper.cpp \ diff --git a/extensions/CocoStudio/Armature/utils/CCArmatureDefine.cpp b/extensions/CocoStudio/Armature/utils/CCArmatureDefine.cpp new file mode 100644 index 0000000000..cbd53fe1e0 --- /dev/null +++ b/extensions/CocoStudio/Armature/utils/CCArmatureDefine.cpp @@ -0,0 +1,34 @@ +/**************************************************************************** +Copyright (c) 2013 cocos2d-x.org + +http://www.cocos2d-x.org + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +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 "CCArmatureDefine.h" + +NS_CC_EXT_ARMATURE_BEGIN + +const char *armatureVersion() +{ + return "0.4.0.0"; +} + +NS_CC_EXT_ARMATURE_END