From 07ec5970fb741f8eac9716017a5bfe0ac3b621cf Mon Sep 17 00:00:00 2001 From: "Huabing.Xu" Date: Mon, 16 Jun 2014 19:18:02 -0700 Subject: [PATCH] 1. using external/json folder for rapidjson 2. linux works now --- cocos/3d/CCBundle3D.h | 2 +- cocos/3d/CMakeLists.txt | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cocos/3d/CCBundle3D.h b/cocos/3d/CCBundle3D.h index 1840311aa3..40a0d6865c 100644 --- a/cocos/3d/CCBundle3D.h +++ b/cocos/3d/CCBundle3D.h @@ -34,7 +34,7 @@ #include "3d/CCMesh.h" #include "3d/CCBundle3DData.h" -#include "document.h" +#include "external/json/document.h" NS_CC_BEGIN diff --git a/cocos/3d/CMakeLists.txt b/cocos/3d/CMakeLists.txt index cb7d6a9de3..ca89693fe3 100644 --- a/cocos/3d/CMakeLists.txt +++ b/cocos/3d/CMakeLists.txt @@ -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 )