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

resolve conflict

This commit is contained in:
yangxiao 2014-06-17 10:52:48 +08:00
parent fb7fc23ee9 07ec5970fb
commit 189fbb7071
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cocos/3d/CCBundle3D.h
View File

@ -33,7 +33,10 @@
#include "base/CCRef.h"
#include "base/ccTypes.h"
#include "document.h"
#include "3d/CCMesh.h"
#include "3d/CCBundle3DData.h"
#include "external/json/document.h"
NS_CC_BEGIN

6
cocos/3d/CMakeLists.txt
View File

@ -2,6 +2,10 @@ set(COCOS_3D_SRC
3d/CCMesh.cpp
3d/CCObjLoader.cpp
3d/CCSprite3D.cpp
3d/CCSprite3DDataCache.cpp
3d/CCSprite3DMaterial.cpp
3d/CCAnimate3D.cpp
3d/CCAnimation3D.cpp
3d/CCBundle3D.cpp
3d/CCMeshSkin.cpp
)