diff --git a/extensions/proj.linux/Makefile b/extensions/proj.linux/Makefile
index 54a0d8c3f6..9194c047cd 100644
--- a/extensions/proj.linux/Makefile
+++ b/extensions/proj.linux/Makefile
@@ -67,6 +67,7 @@ SOURCES = ../CCBReader/CCBFileLoader.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 \
diff --git a/samples/Cpp/TestCpp/Android.mk b/samples/Cpp/TestCpp/Android.mk
index 68106673cd..d1c7c20529 100644
--- a/samples/Cpp/TestCpp/Android.mk
+++ b/samples/Cpp/TestCpp/Android.mk
@@ -44,8 +44,6 @@ Classes/DataVisitorTest/DataVisitorTest.cpp \
 Classes/DrawPrimitivesTest/DrawPrimitivesTest.cpp \
 Classes/EffectsAdvancedTest/EffectsAdvancedTest.cpp \
 Classes/EffectsTest/EffectsTest.cpp \
-Classes/ExtensionsTest/ExtensionsTest.cpp \
-Classes/ExtensionsTest/ArmatureTest/ArmatureScene.cpp \
 Classes/ExtensionsTest/CocosBuilderTest/CocosBuilderTest.cpp \
 Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.cpp \
 Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.cpp \
@@ -53,12 +51,6 @@ Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer
 Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.cpp \
 Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.cpp \
 Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.cpp \
-Classes/ExtensionsTest/ComponentsTest/ComponentsTestScene.cpp \
-Classes/ExtensionsTest/ComponentsTest/EnemyController.cpp \
-Classes/ExtensionsTest/ComponentsTest/GameOverScene.cpp \
-Classes/ExtensionsTest/ComponentsTest/PlayerController.cpp \
-Classes/ExtensionsTest/ComponentsTest/ProjectileController.cpp \
-Classes/ExtensionsTest/ComponentsTest/SceneController.cpp \
 Classes/ExtensionsTest/ControlExtensionTest/CCControlScene.cpp \
 Classes/ExtensionsTest/ControlExtensionTest/CCControlSceneManager.cpp \
 Classes/ExtensionsTest/ControlExtensionTest/CCControlButtonTest/CCControlButtonTest.cpp \
@@ -75,6 +67,15 @@ Classes/ExtensionsTest/NotificationCenterTest/NotificationCenterTest.cpp \
 Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.cpp \
 Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.cpp \
 Classes/ExtensionsTest/TableViewTest/TableViewTestScene.cpp \
+Classes/ExtensionsTest/ExtensionsTest.cpp \
+Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp \
+Classes/ExtensionsTest/CocoStudioComponentsTest/ComponentsTestScene.cpp \
+Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.cpp \
+Classes/ExtensionsTest/CocoStudioComponentsTest/GameOverScene.cpp \
+Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.cpp \
+Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.cpp \
+Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.cpp \
+Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.cpp \
 Classes/FileUtilsTest/FileUtilsTest.cpp \
 Classes/FontTest/FontTest.cpp \
 Classes/IntervalTest/IntervalTest.cpp \
diff --git a/samples/Cpp/TestCpp/proj.nacl/Makefile b/samples/Cpp/TestCpp/proj.nacl/Makefile
index b1dab9b36a..4051d67ed7 100644
--- a/samples/Cpp/TestCpp/proj.nacl/Makefile
+++ b/samples/Cpp/TestCpp/proj.nacl/Makefile
@@ -54,7 +54,7 @@ SOURCES = ../Classes/AccelerometerTest/AccelerometerTest.cpp \
 	../Classes/ExtensionsTest/TableViewTest/TableViewTestScene.cpp \
 	../Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.cpp \
 	../Classes/ExtensionsTest/ExtensionsTest.cpp \
-	../Classes/ExtensionsTest/NotificationCenterTest/NotificationCenterTest.cpp \
+    ../Classes/ExtensionsTest/NotificationCenterTest/NotificationCenterTest.cpp \
     ../Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp \
 	../Classes/ExtensionsTest/CocoStudioComponentsTest/ComponentsTestScene.cpp \
 	../Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.cpp \