From 9fabf3a45b3c07e91698303624c08d5a5ad5c3c9 Mon Sep 17 00:00:00 2001
From: James Chen <jianhua.chen@cocos2d-x.org>
Date: Wed, 19 Sep 2012 18:41:50 +0800
Subject: [PATCH] fixed #1470: Made CCBReader support cocosbuilder v2.1-beta0.

---
 extensions/CCBReader/CCBSequence.h            |   3 +-
 extensions/cocos-ext.h                        |   7 +
 extensions/proj.win32/libExtensions.vcproj    |  56 ++++
 extensions/proj.win32/libExtensions.vcxproj   |  14 +
 .../proj.win32/libExtensions.vcxproj.filters  | 270 ++++++++++--------
 .../AnimationsTest/AnimationsLayerLoader.h    |   1 -
 .../AnimationsTest/AnimationsTestLayer.cpp    |   1 -
 samples/TestCpp/proj.win32/TestCpp.vcproj     |  16 ++
 samples/TestCpp/proj.win32/TestCpp.vcxproj    |   3 +
 .../proj.win32/TestCpp.vcxproj.filters        |  12 +
 10 files changed, 266 insertions(+), 117 deletions(-)

diff --git a/extensions/CCBReader/CCBSequence.h b/extensions/CCBReader/CCBSequence.h
index 55a4a8013a..b253f19888 100644
--- a/extensions/CCBReader/CCBSequence.h
+++ b/extensions/CCBReader/CCBSequence.h
@@ -1,8 +1,9 @@
 #ifndef __CCB_CCSEQUENCE_H__
 #define __CCB_CCSEQUENCE_H__
 
-#include "cocos-ext.h"
 #include <string>
+#include "cocos2d.h"
+#include "ExtensionMacros.h"
 
 NS_CC_EXT_BEGIN
 
diff --git a/extensions/cocos-ext.h b/extensions/cocos-ext.h
index 8842b1ceeb..55d9bb6f04 100644
--- a/extensions/cocos-ext.h
+++ b/extensions/cocos-ext.h
@@ -24,6 +24,13 @@
 #include "CCBReader/CCScale9SpriteLoader.h"
 #include "CCBReader/CCScrollViewLoader.h"
 #include "CCBReader/CCSpriteLoader.h"
+#include "CCBReader/CCBAnimationManager.h"
+#include "CCBReader/CCBKeyframe.h"
+#include "CCBReader/CCBSequence.h"
+#include "CCBReader/CCBSequenceProperty.h"
+#include "CCBReader/CCBValue.h"
+#include "CCBReader/CCData.h"
+#include "CCBReader/CCNode+CCBRelativePositioning.h"
 
 #include "GUI/CCControlExtension/CCControlExtensions.h"
 #include "GUI/CCScrollView/CCScrollView.h"
diff --git a/extensions/proj.win32/libExtensions.vcproj b/extensions/proj.win32/libExtensions.vcproj
index 36ad9bc313..8853c4df2e 100644
--- a/extensions/proj.win32/libExtensions.vcproj
+++ b/extensions/proj.win32/libExtensions.vcproj
@@ -150,6 +150,14 @@
 		<Filter
 			Name="CCBReader"
 			>
+			<File
+				RelativePath="..\CCBReader\CCBAnimationManager.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\CCBReader\CCBAnimationManager.h"
+				>
+			</File>
 			<File
 				RelativePath="..\CCBReader\CCBFileLoader.cpp"
 				>
@@ -158,6 +166,14 @@
 				RelativePath="..\CCBReader\CCBFileLoader.h"
 				>
 			</File>
+			<File
+				RelativePath="..\CCBReader\CCBKeyframe.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\CCBReader\CCBKeyframe.h"
+				>
+			</File>
 			<File
 				RelativePath="..\CCBReader\CCBMemberVariableAssigner.h"
 				>
@@ -174,6 +190,30 @@
 				RelativePath="..\CCBReader\CCBSelectorResolver.h"
 				>
 			</File>
+			<File
+				RelativePath="..\CCBReader\CCBSequence.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\CCBReader\CCBSequence.h"
+				>
+			</File>
+			<File
+				RelativePath="..\CCBReader\CCBSequenceProperty.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\CCBReader\CCBSequenceProperty.h"
+				>
+			</File>
+			<File
+				RelativePath="..\CCBReader\CCBValue.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\CCBReader\CCBValue.h"
+				>
+			</File>
 			<File
 				RelativePath="..\CCBReader\CCControlButtonLoader.cpp"
 				>
@@ -190,6 +230,14 @@
 				RelativePath="..\CCBReader\CCControlLoader.h"
 				>
 			</File>
+			<File
+				RelativePath="..\CCBReader\CCData.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\CCBReader\CCData.h"
+				>
+			</File>
 			<File
 				RelativePath="..\CCBReader\CCLabelBMFontLoader.cpp"
 				>
@@ -250,6 +298,14 @@
 				RelativePath="..\CCBReader\CCMenuLoader.h"
 				>
 			</File>
+			<File
+				RelativePath="..\CCBReader\CCNode+CCBRelativePositioning.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\CCBReader\CCNode+CCBRelativePositioning.h"
+				>
+			</File>
 			<File
 				RelativePath="..\CCBReader\CCNodeLoader.cpp"
 				>
diff --git a/extensions/proj.win32/libExtensions.vcxproj b/extensions/proj.win32/libExtensions.vcxproj
index 32f9ed95a9..66047eb66e 100644
--- a/extensions/proj.win32/libExtensions.vcxproj
+++ b/extensions/proj.win32/libExtensions.vcxproj
@@ -79,10 +79,16 @@
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\CCBReader\CCBAnimationManager.cpp" />
     <ClCompile Include="..\CCBReader\CCBFileLoader.cpp" />
+    <ClCompile Include="..\CCBReader\CCBKeyframe.cpp" />
     <ClCompile Include="..\CCBReader\CCBReader.cpp" />
+    <ClCompile Include="..\CCBReader\CCBSequence.cpp" />
+    <ClCompile Include="..\CCBReader\CCBSequenceProperty.cpp" />
+    <ClCompile Include="..\CCBReader\CCBValue.cpp" />
     <ClCompile Include="..\CCBReader\CCControlButtonLoader.cpp" />
     <ClCompile Include="..\CCBReader\CCControlLoader.cpp" />
+    <ClCompile Include="..\CCBReader\CCData.cpp" />
     <ClCompile Include="..\CCBReader\CCLabelBMFontLoader.cpp" />
     <ClCompile Include="..\CCBReader\CCLabelTTFLoader.cpp" />
     <ClCompile Include="..\CCBReader\CCLayerColorLoader.cpp" />
@@ -90,6 +96,7 @@
     <ClCompile Include="..\CCBReader\CCLayerLoader.cpp" />
     <ClCompile Include="..\CCBReader\CCMenuItemImageLoader.cpp" />
     <ClCompile Include="..\CCBReader\CCMenuItemLoader.cpp" />
+    <ClCompile Include="..\CCBReader\CCNode+CCBRelativePositioning.cpp" />
     <ClCompile Include="..\CCBReader\CCNodeLoader.cpp" />
     <ClCompile Include="..\CCBReader\CCNodeLoaderLibrary.cpp" />
     <ClCompile Include="..\CCBReader\CCParticleSystemQuadLoader.cpp" />
@@ -115,12 +122,18 @@
     <ClCompile Include="..\network\HttpClient.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\CCBReader\CCBAnimationManager.h" />
     <ClInclude Include="..\CCBReader\CCBFileLoader.h" />
+    <ClInclude Include="..\CCBReader\CCBKeyframe.h" />
     <ClInclude Include="..\CCBReader\CCBMemberVariableAssigner.h" />
     <ClInclude Include="..\CCBReader\CCBReader.h" />
     <ClInclude Include="..\CCBReader\CCBSelectorResolver.h" />
+    <ClInclude Include="..\CCBReader\CCBSequence.h" />
+    <ClInclude Include="..\CCBReader\CCBSequenceProperty.h" />
+    <ClInclude Include="..\CCBReader\CCBValue.h" />
     <ClInclude Include="..\CCBReader\CCControlButtonLoader.h" />
     <ClInclude Include="..\CCBReader\CCControlLoader.h" />
+    <ClInclude Include="..\CCBReader\CCData.h" />
     <ClInclude Include="..\CCBReader\CCLabelBMFontLoader.h" />
     <ClInclude Include="..\CCBReader\CCLabelTTFLoader.h" />
     <ClInclude Include="..\CCBReader\CCLayerColorLoader.h" />
@@ -129,6 +142,7 @@
     <ClInclude Include="..\CCBReader\CCMenuItemImageLoader.h" />
     <ClInclude Include="..\CCBReader\CCMenuItemLoader.h" />
     <ClInclude Include="..\CCBReader\CCMenuLoader.h" />
+    <ClInclude Include="..\CCBReader\CCNode+CCBRelativePositioning.h" />
     <ClInclude Include="..\CCBReader\CCNodeLoader.h" />
     <ClInclude Include="..\CCBReader\CCNodeLoaderLibrary.h" />
     <ClInclude Include="..\CCBReader\CCNodeLoaderListener.h" />
diff --git a/extensions/proj.win32/libExtensions.vcxproj.filters b/extensions/proj.win32/libExtensions.vcxproj.filters
index 3dfab3a3d7..19f47f527d 100644
--- a/extensions/proj.win32/libExtensions.vcxproj.filters
+++ b/extensions/proj.win32/libExtensions.vcxproj.filters
@@ -18,57 +18,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\CCBReader\CCBFileLoader.cpp">
-      <Filter>CCBReader</Filter>
-    </ClCompile>
-    <ClCompile Include="..\CCBReader\CCBReader.cpp">
-      <Filter>CCBReader</Filter>
-    </ClCompile>
-    <ClCompile Include="..\CCBReader\CCControlButtonLoader.cpp">
-      <Filter>CCBReader</Filter>
-    </ClCompile>
-    <ClCompile Include="..\CCBReader\CCControlLoader.cpp">
-      <Filter>CCBReader</Filter>
-    </ClCompile>
-    <ClCompile Include="..\CCBReader\CCLabelBMFontLoader.cpp">
-      <Filter>CCBReader</Filter>
-    </ClCompile>
-    <ClCompile Include="..\CCBReader\CCLabelTTFLoader.cpp">
-      <Filter>CCBReader</Filter>
-    </ClCompile>
-    <ClCompile Include="..\CCBReader\CCLayerColorLoader.cpp">
-      <Filter>CCBReader</Filter>
-    </ClCompile>
-    <ClCompile Include="..\CCBReader\CCLayerGradientLoader.cpp">
-      <Filter>CCBReader</Filter>
-    </ClCompile>
-    <ClCompile Include="..\CCBReader\CCLayerLoader.cpp">
-      <Filter>CCBReader</Filter>
-    </ClCompile>
-    <ClCompile Include="..\CCBReader\CCMenuItemImageLoader.cpp">
-      <Filter>CCBReader</Filter>
-    </ClCompile>
-    <ClCompile Include="..\CCBReader\CCMenuItemLoader.cpp">
-      <Filter>CCBReader</Filter>
-    </ClCompile>
-    <ClCompile Include="..\CCBReader\CCNodeLoader.cpp">
-      <Filter>CCBReader</Filter>
-    </ClCompile>
-    <ClCompile Include="..\CCBReader\CCNodeLoaderLibrary.cpp">
-      <Filter>CCBReader</Filter>
-    </ClCompile>
-    <ClCompile Include="..\CCBReader\CCParticleSystemQuadLoader.cpp">
-      <Filter>CCBReader</Filter>
-    </ClCompile>
-    <ClCompile Include="..\CCBReader\CCScale9SpriteLoader.cpp">
-      <Filter>CCBReader</Filter>
-    </ClCompile>
-    <ClCompile Include="..\CCBReader\CCScrollViewLoader.cpp">
-      <Filter>CCBReader</Filter>
-    </ClCompile>
-    <ClCompile Include="..\CCBReader\CCSpriteLoader.cpp">
-      <Filter>CCBReader</Filter>
-    </ClCompile>
     <ClCompile Include="..\GUI\CCControlExtension\CCControl.cpp">
       <Filter>GUI\CCControlExtension</Filter>
     </ClCompile>
@@ -120,71 +69,80 @@
     <ClCompile Include="..\GUI\CCScrollView\CCTableViewCell.cpp">
       <Filter>GUI\CCScrollView</Filter>
     </ClCompile>
+    <ClCompile Include="..\CCBReader\CCBAnimationManager.cpp">
+      <Filter>CCBReader</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CCBReader\CCBFileLoader.cpp">
+      <Filter>CCBReader</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CCBReader\CCBKeyframe.cpp">
+      <Filter>CCBReader</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CCBReader\CCBReader.cpp">
+      <Filter>CCBReader</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CCBReader\CCBSequence.cpp">
+      <Filter>CCBReader</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CCBReader\CCBSequenceProperty.cpp">
+      <Filter>CCBReader</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CCBReader\CCBValue.cpp">
+      <Filter>CCBReader</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CCBReader\CCControlButtonLoader.cpp">
+      <Filter>CCBReader</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CCBReader\CCControlLoader.cpp">
+      <Filter>CCBReader</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CCBReader\CCData.cpp">
+      <Filter>CCBReader</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CCBReader\CCLabelBMFontLoader.cpp">
+      <Filter>CCBReader</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CCBReader\CCLabelTTFLoader.cpp">
+      <Filter>CCBReader</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CCBReader\CCLayerColorLoader.cpp">
+      <Filter>CCBReader</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CCBReader\CCLayerGradientLoader.cpp">
+      <Filter>CCBReader</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CCBReader\CCLayerLoader.cpp">
+      <Filter>CCBReader</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CCBReader\CCMenuItemImageLoader.cpp">
+      <Filter>CCBReader</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CCBReader\CCMenuItemLoader.cpp">
+      <Filter>CCBReader</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CCBReader\CCNode+CCBRelativePositioning.cpp">
+      <Filter>CCBReader</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CCBReader\CCNodeLoader.cpp">
+      <Filter>CCBReader</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CCBReader\CCNodeLoaderLibrary.cpp">
+      <Filter>CCBReader</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CCBReader\CCParticleSystemQuadLoader.cpp">
+      <Filter>CCBReader</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CCBReader\CCScale9SpriteLoader.cpp">
+      <Filter>CCBReader</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CCBReader\CCScrollViewLoader.cpp">
+      <Filter>CCBReader</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CCBReader\CCSpriteLoader.cpp">
+      <Filter>CCBReader</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\CCBReader\CCBFileLoader.h">
-      <Filter>CCBReader</Filter>
-    </ClInclude>
-    <ClInclude Include="..\CCBReader\CCBMemberVariableAssigner.h">
-      <Filter>CCBReader</Filter>
-    </ClInclude>
-    <ClInclude Include="..\CCBReader\CCBReader.h">
-      <Filter>CCBReader</Filter>
-    </ClInclude>
-    <ClInclude Include="..\CCBReader\CCBSelectorResolver.h">
-      <Filter>CCBReader</Filter>
-    </ClInclude>
-    <ClInclude Include="..\CCBReader\CCControlButtonLoader.h">
-      <Filter>CCBReader</Filter>
-    </ClInclude>
-    <ClInclude Include="..\CCBReader\CCControlLoader.h">
-      <Filter>CCBReader</Filter>
-    </ClInclude>
-    <ClInclude Include="..\CCBReader\CCLabelBMFontLoader.h">
-      <Filter>CCBReader</Filter>
-    </ClInclude>
-    <ClInclude Include="..\CCBReader\CCLabelTTFLoader.h">
-      <Filter>CCBReader</Filter>
-    </ClInclude>
-    <ClInclude Include="..\CCBReader\CCLayerColorLoader.h">
-      <Filter>CCBReader</Filter>
-    </ClInclude>
-    <ClInclude Include="..\CCBReader\CCLayerGradientLoader.h">
-      <Filter>CCBReader</Filter>
-    </ClInclude>
-    <ClInclude Include="..\CCBReader\CCLayerLoader.h">
-      <Filter>CCBReader</Filter>
-    </ClInclude>
-    <ClInclude Include="..\CCBReader\CCMenuItemImageLoader.h">
-      <Filter>CCBReader</Filter>
-    </ClInclude>
-    <ClInclude Include="..\CCBReader\CCMenuItemLoader.h">
-      <Filter>CCBReader</Filter>
-    </ClInclude>
-    <ClInclude Include="..\CCBReader\CCMenuLoader.h">
-      <Filter>CCBReader</Filter>
-    </ClInclude>
-    <ClInclude Include="..\CCBReader\CCNodeLoader.h">
-      <Filter>CCBReader</Filter>
-    </ClInclude>
-    <ClInclude Include="..\CCBReader\CCNodeLoaderLibrary.h">
-      <Filter>CCBReader</Filter>
-    </ClInclude>
-    <ClInclude Include="..\CCBReader\CCNodeLoaderListener.h">
-      <Filter>CCBReader</Filter>
-    </ClInclude>
-    <ClInclude Include="..\CCBReader\CCParticleSystemQuadLoader.h">
-      <Filter>CCBReader</Filter>
-    </ClInclude>
-    <ClInclude Include="..\CCBReader\CCScale9SpriteLoader.h">
-      <Filter>CCBReader</Filter>
-    </ClInclude>
-    <ClInclude Include="..\CCBReader\CCScrollViewLoader.h">
-      <Filter>CCBReader</Filter>
-    </ClInclude>
-    <ClInclude Include="..\CCBReader\CCSpriteLoader.h">
-      <Filter>CCBReader</Filter>
-    </ClInclude>
     <ClInclude Include="..\GUI\CCControlExtension\CCControl.h">
       <Filter>GUI\CCControlExtension</Filter>
     </ClInclude>
@@ -247,5 +205,89 @@
     <ClInclude Include="..\GUI\CCScrollView\CCTableViewCell.h">
       <Filter>GUI\CCScrollView</Filter>
     </ClInclude>
+    <ClInclude Include="..\CCBReader\CCBAnimationManager.h">
+      <Filter>CCBReader</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CCBReader\CCBFileLoader.h">
+      <Filter>CCBReader</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CCBReader\CCBKeyframe.h">
+      <Filter>CCBReader</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CCBReader\CCBMemberVariableAssigner.h">
+      <Filter>CCBReader</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CCBReader\CCBReader.h">
+      <Filter>CCBReader</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CCBReader\CCBSelectorResolver.h">
+      <Filter>CCBReader</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CCBReader\CCBSequence.h">
+      <Filter>CCBReader</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CCBReader\CCBSequenceProperty.h">
+      <Filter>CCBReader</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CCBReader\CCBValue.h">
+      <Filter>CCBReader</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CCBReader\CCControlButtonLoader.h">
+      <Filter>CCBReader</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CCBReader\CCControlLoader.h">
+      <Filter>CCBReader</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CCBReader\CCData.h">
+      <Filter>CCBReader</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CCBReader\CCLabelBMFontLoader.h">
+      <Filter>CCBReader</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CCBReader\CCLabelTTFLoader.h">
+      <Filter>CCBReader</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CCBReader\CCLayerColorLoader.h">
+      <Filter>CCBReader</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CCBReader\CCLayerGradientLoader.h">
+      <Filter>CCBReader</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CCBReader\CCLayerLoader.h">
+      <Filter>CCBReader</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CCBReader\CCMenuItemImageLoader.h">
+      <Filter>CCBReader</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CCBReader\CCMenuItemLoader.h">
+      <Filter>CCBReader</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CCBReader\CCMenuLoader.h">
+      <Filter>CCBReader</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CCBReader\CCNode+CCBRelativePositioning.h">
+      <Filter>CCBReader</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CCBReader\CCNodeLoader.h">
+      <Filter>CCBReader</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CCBReader\CCNodeLoaderLibrary.h">
+      <Filter>CCBReader</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CCBReader\CCNodeLoaderListener.h">
+      <Filter>CCBReader</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CCBReader\CCParticleSystemQuadLoader.h">
+      <Filter>CCBReader</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CCBReader\CCScale9SpriteLoader.h">
+      <Filter>CCBReader</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CCBReader\CCScrollViewLoader.h">
+      <Filter>CCBReader</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CCBReader\CCSpriteLoader.h">
+      <Filter>CCBReader</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsLayerLoader.h b/samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsLayerLoader.h
index 7038cd9406..3cc435c93f 100644
--- a/samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsLayerLoader.h
+++ b/samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsLayerLoader.h
@@ -2,7 +2,6 @@
 #define _ANIMATIONSTESTLAYERLOADER_H_
 
 #include "AnimationsTestLayer.h"
-#include "CCNodeLoader.h"
 
 /* Forward declaration. */
 class CCBReader;
diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.cpp b/samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.cpp
index 8769d080d4..b03b5e9939 100644
--- a/samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.cpp
+++ b/samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.cpp
@@ -1,5 +1,4 @@
 #include "AnimationsTestLayer.h"
-#include "CCBAnimationManager.h"
 
 USING_NS_CC;
 USING_NS_CC_EXT;
diff --git a/samples/TestCpp/proj.win32/TestCpp.vcproj b/samples/TestCpp/proj.win32/TestCpp.vcproj
index f664a59cc3..0ccd95ae80 100644
--- a/samples/TestCpp/proj.win32/TestCpp.vcproj
+++ b/samples/TestCpp/proj.win32/TestCpp.vcproj
@@ -1010,6 +1010,22 @@
 							>
 						</File>
 					</Filter>
+					<Filter
+						Name="AnimationsTest"
+						>
+						<File
+							RelativePath="..\Classes\ExtensionsTest\CocosBuilderTest\AnimationsTest\AnimationsLayerLoader.h"
+							>
+						</File>
+						<File
+							RelativePath="..\Classes\ExtensionsTest\CocosBuilderTest\AnimationsTest\AnimationsTestLayer.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\Classes\ExtensionsTest\CocosBuilderTest\AnimationsTest\AnimationsTestLayer.h"
+							>
+						</File>
+					</Filter>
 				</Filter>
 				<Filter
 					Name="NetworkTest"
diff --git a/samples/TestCpp/proj.win32/TestCpp.vcxproj b/samples/TestCpp/proj.win32/TestCpp.vcxproj
index a2fc4033d9..2472e7e614 100644
--- a/samples/TestCpp/proj.win32/TestCpp.vcxproj
+++ b/samples/TestCpp/proj.win32/TestCpp.vcxproj
@@ -107,6 +107,7 @@
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\Classes\ExtensionsTest\CocosBuilderTest\AnimationsTest\AnimationsTestLayer.cpp" />
     <ClCompile Include="..\Classes\ExtensionsTest\NetworkTest\HttpClientTest.cpp" />
     <ClCompile Include="..\Classes\ExtensionsTest\TableViewTest\CustomTableViewCell.cpp" />
     <ClCompile Include="..\Classes\ExtensionsTest\TableViewTest\TableViewTestScene.cpp" />
@@ -191,6 +192,8 @@
     <ClCompile Include="..\Classes\MutiTouchTest\MutiTouchTest.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\Classes\ExtensionsTest\CocosBuilderTest\AnimationsTest\AnimationsLayerLoader.h" />
+    <ClInclude Include="..\Classes\ExtensionsTest\CocosBuilderTest\AnimationsTest\AnimationsTestLayer.h" />
     <ClInclude Include="..\Classes\ExtensionsTest\NetworkTest\HttpClientTest.h" />
     <ClInclude Include="..\Classes\ExtensionsTest\TableViewTest\CustomTableViewCell.h" />
     <ClInclude Include="..\Classes\ExtensionsTest\TableViewTest\TableViewTestScene.h" />
diff --git a/samples/TestCpp/proj.win32/TestCpp.vcxproj.filters b/samples/TestCpp/proj.win32/TestCpp.vcxproj.filters
index 0f76196539..ee747ea454 100644
--- a/samples/TestCpp/proj.win32/TestCpp.vcxproj.filters
+++ b/samples/TestCpp/proj.win32/TestCpp.vcxproj.filters
@@ -193,6 +193,9 @@
     <Filter Include="Classes\ExtensionsTest\TableViewTest">
       <UniqueIdentifier>{2603ae57-b062-4281-9daf-c925634eaeb4}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Classes\ExtensionsTest\AnimationsTest">
+      <UniqueIdentifier>{e8752620-8414-4f43-a572-5fa82650f223}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="main.cpp">
@@ -441,6 +444,9 @@
     <ClCompile Include="..\Classes\ExtensionsTest\TableViewTest\TableViewTestScene.cpp">
       <Filter>Classes\ExtensionsTest\TableViewTest</Filter>
     </ClCompile>
+    <ClCompile Include="..\Classes\ExtensionsTest\CocosBuilderTest\AnimationsTest\AnimationsTestLayer.cpp">
+      <Filter>Classes\ExtensionsTest\AnimationsTest</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="main.h">
@@ -863,5 +869,11 @@
     <ClInclude Include="..\Classes\ExtensionsTest\TableViewTest\TableViewTestScene.h">
       <Filter>Classes\ExtensionsTest\TableViewTest</Filter>
     </ClInclude>
+    <ClInclude Include="..\Classes\ExtensionsTest\CocosBuilderTest\AnimationsTest\AnimationsLayerLoader.h">
+      <Filter>Classes\ExtensionsTest\AnimationsTest</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Classes\ExtensionsTest\CocosBuilderTest\AnimationsTest\AnimationsTestLayer.h">
+      <Filter>Classes\ExtensionsTest\AnimationsTest</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file