Merge pull request #11713 from ricardoquesada/include_header_love

adds love to header files
This commit is contained in:
Ricardo Quesada 2015-05-05 22:42:27 -07:00
commit 9ca2f79ff2
4 changed files with 8 additions and 14 deletions

View File

@ -31,7 +31,7 @@ NS_CC_BEGIN
CC_DLL const char* cocos2dVersion()
{
return "cocos2d-x 3.6";
return "cocos2d-x 3.7-pre";
}
NS_CC_END

View File

@ -29,8 +29,8 @@ THE SOFTWARE.
#define __COCOS2D_H__
// 0x00 HI ME LO
// 00 03 03 00
#define COCOS2D_VERSION 0x00030600
// 00 03 07 00
#define COCOS2D_VERSION 0x00030700
//
// all cocos2d include files
@ -61,6 +61,7 @@ THE SOFTWARE.
#include "base/CCIMEDelegate.h"
#include "base/CCIMEDispatcher.h"
#include "base/ccUtils.h"
#include "base/CCAsyncTaskPool.h"
// EventDispatcher
#include "base/CCEventType.h"
@ -163,6 +164,10 @@ THE SOFTWARE.
#include "renderer/CCPrimitive.h"
#include "renderer/CCPrimitiveCommand.h"
#include "renderer/CCTrianglesCommand.h"
#include "renderer/CCMaterial.h"
#include "renderer/CCTechnique.h"
#include "renderer/CCPass.h"
#include "renderer/CCRenderState.h"
// physics
#include "physics/CCPhysicsBody.h"

View File

@ -27,8 +27,6 @@
#include "../testResource.h"
#include "cocos2d.h"
#include "renderer/CCMaterial.h"
USING_NS_CC;

View File

@ -24,15 +24,6 @@
****************************************************************************/
#include "Sprite3DTest.h"
#include "base/CCAsyncTaskPool.h"
#include "3d/CCAnimation3D.h"
#include "3d/CCAnimate3D.h"
#include "3d/CCAttachNode.h"
#include "3d/CCRay.h"
#include "3d/CCSprite3D.h"
#include "3d/CCTextureCube.h"
#include "3d/CCSkybox.h"
#include "renderer/CCVertexIndexBuffer.h"
#include "DrawNode3D.h"
#include <algorithm>