From aa5f7ffb6a40bacf84c1ceb0170949ff4cd3d2e1 Mon Sep 17 00:00:00 2001
From: James Chen <jianhua.chen@cocos2d-x.org>
Date: Tue, 19 Mar 2013 17:46:49 +0800
Subject: [PATCH] Updating project setting of testcpp for Marmalade.

---
 extensions/proj.marmalade/cocos2dx-ext.mkf    |  16 +--
 .../Classes/ExtensionsTest/ExtensionsTest.cpp |   3 -
 .../Cpp/TestCpp/proj.marmalade/TestCPP.mkb    | 104 +++++++++---------
 3 files changed, 52 insertions(+), 71 deletions(-)

diff --git a/extensions/proj.marmalade/cocos2dx-ext.mkf b/extensions/proj.marmalade/cocos2dx-ext.mkf
index 14d1002e54..3a4ceebc43 100644
--- a/extensions/proj.marmalade/cocos2dx-ext.mkf
+++ b/extensions/proj.marmalade/cocos2dx-ext.mkf
@@ -24,10 +24,8 @@ files
 	
 	["CCBReader"]
 	("../CCBReader")
-    CCBReader.h
-#    CCBCustomClass.h
-#    CCBCustomClass.cpp
-#    CCBReader_v1.cpp
+    "*.h"
+    "*.cpp"
 
 	["GUI/CCControlExtension"]
 	("../GUI/CCControlExtension")
@@ -44,16 +42,6 @@ files
     "*.h"
     "*.cpp"
 
-#	["CCListView"]
-#	("../CCListView")
-#    "*.h"
-#    "*.cpp"
-
-#	["CCTextureWatcher"]
-#	("../CCTextureWatcher")
-#    "*.h"
-#    "*.cpp"
-
 	["PhysicsNodes"]
 	("../physics_nodes")
     "*.h"
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/ExtensionsTest.cpp b/samples/Cpp/TestCpp/Classes/ExtensionsTest/ExtensionsTest.cpp
index 073ec0ea11..5c7354ee0e 100644
--- a/samples/Cpp/TestCpp/Classes/ExtensionsTest/ExtensionsTest.cpp
+++ b/samples/Cpp/TestCpp/Classes/ExtensionsTest/ExtensionsTest.cpp
@@ -88,7 +88,6 @@ void ExtensionsMainLayer::menuCallback(CCObject* pSender)
             CCDirector::sharedDirector()->replaceScene(pScene);
         }
         break;
-#if (CC_TARGET_PLATFORM != CC_PLATFORM_MARMALADE)	// MARMALADE CHANGE: Not yet avaiable on Marmalade
     case TEST_COCOSBUILDER:
         {
             TestScene* pScene = new CocosBuilderTestScene();
@@ -99,8 +98,6 @@ void ExtensionsMainLayer::menuCallback(CCObject* pSender)
             }
         }
         break;
-#endif
-// MARMALADE CHANGE: Not yet avaiable on Marmalade
 #if (CC_TARGET_PLATFORM != CC_PLATFORM_MARMALADE && CC_TARGET_PLATFORM != CC_PLATFORM_NACL)
     case TEST_HTTPCLIENT:
         {
diff --git a/samples/Cpp/TestCpp/proj.marmalade/TestCPP.mkb b/samples/Cpp/TestCpp/proj.marmalade/TestCPP.mkb
index dfade344ec..ba916b3aa0 100644
--- a/samples/Cpp/TestCpp/proj.marmalade/TestCPP.mkb
+++ b/samples/Cpp/TestCpp/proj.marmalade/TestCPP.mkb
@@ -207,60 +207,56 @@ files
 	ExtensionsTest.cpp
 	ExtensionsTest.h
 
-#	[Test/ExtensionsTest/CocosBuilderTest]
-#	(../Classes/ExtensionsTest/CocosBuilderTest)
-#	CocosBuilderTest.cpp
-#	CocosBuilderTest.h
-#
-#	[Test/ExtensionsTest/CocosBuilderTest/AnimationsTest]
-#	(../Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest)
-#	AnimationsLayerLoader.h
-#	AnimationsTestLayer.cpp
-#	AnimationsTestLayer.h
-#
-#	[Test/ExtensionsTest/CocosBuilderTest/ButtonTest]
-#	(../Classes/ExtensionsTest/CocosBuilderTest/ButtonTest)
-#	ButtonTestLayer.cpp
-#	ButtonTestLayer.h
-#	ButtonTestLayerLoader.h
-#
-#	[Test/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder]
-#	(../Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder)
-#	HelloCocosBuilderLayer.cpp
-#	HelloCocosBuilderLayer.h
-#	HelloCocosBuilderLayerLoader.h
-#
-#	[Test/ExtensionsTest/CocosBuilderTest/LabelTest]
-#	(../Classes/ExtensionsTest/CocosBuilderTest/LabelTest)
-#	LabelTestLayer.h
-#	LabelTestLayerLoader.h
-#
-#	[Test/ExtensionsTest/CocosBuilderTest/MenuTest]
-#	(../Classes/ExtensionsTest/CocosBuilderTest/MenuTest)
-#	MenuTestLayer.cpp
-#	MenuTestLayer.h
-#	MenuTestLayerLoader.h
-#
-#	[Test/ExtensionsTest/CocosBuilderTest/ParticleSystemTest]
-#	(../Classes/ExtensionsTest/CocosBuilderTest/ParticleSystemTest)
-#	ParticleSystemTestLayer.h
-#	ParticleSystemTestLayerLoader.h
-#
-#	[Test/ExtensionsTest/CocosBuilderTest/ScrollViewTest]
-#	(../Classes/ExtensionsTest/CocosBuilderTest/ScrollViewTest)
-#	ScrollViewTestLayer.h
-#	ScrollViewTestLayerLoader.h
-#
-#	[Test/ExtensionsTest/CocosBuilderTest/SpriteTest]
-#	(../Classes/ExtensionsTest/CocosBuilderTest/SpriteTest)
-#	SpriteTestLayer.h
-#	SpriteTestLayerLoader.h
-#
-#	[Test/ExtensionsTest/CocosBuilderTest/TestHeader]
-#	(../Classes/ExtensionsTest/CocosBuilderTest/TestHeader)
-#	TestHeaderLayer.cpp
-#	TestHeaderLayer.h
-#	TestHeaderLayerLoader.h
+	[Test/ExtensionsTest/CocosBuilderTest]
+	(../Classes/ExtensionsTest/CocosBuilderTest)
+	"*.h"
+	"*.cpp"
+
+	[Test/ExtensionsTest/CocosBuilderTest/AnimationsTest]
+	(../Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest)
+	"*.h"
+	"*.cpp"
+
+	[Test/ExtensionsTest/CocosBuilderTest/ButtonTest]
+	(../Classes/ExtensionsTest/CocosBuilderTest/ButtonTest)
+	"*.h"
+	"*.cpp"
+
+	[Test/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder]
+	(../Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder)
+	"*.h"
+	"*.cpp"
+
+	[Test/ExtensionsTest/CocosBuilderTest/LabelTest]
+	(../Classes/ExtensionsTest/CocosBuilderTest/LabelTest)
+	"*.h"
+
+	[Test/ExtensionsTest/CocosBuilderTest/MenuTest]
+	(../Classes/ExtensionsTest/CocosBuilderTest/MenuTest)
+	"*.h"
+	"*.cpp"
+
+	[Test/ExtensionsTest/CocosBuilderTest/ParticleSystemTest]
+	(../Classes/ExtensionsTest/CocosBuilderTest/ParticleSystemTest)
+	"*.h"
+
+	[Test/ExtensionsTest/CocosBuilderTest/ScrollViewTest]
+	(../Classes/ExtensionsTest/CocosBuilderTest/ScrollViewTest)
+	"*.h"
+
+	[Test/ExtensionsTest/CocosBuilderTest/SpriteTest]
+	(../Classes/ExtensionsTest/CocosBuilderTest/SpriteTest)
+	"*.h"
+
+	[Test/ExtensionsTest/CocosBuilderTest/TestHeader]
+	(../Classes/ExtensionsTest/CocosBuilderTest/TestHeader)
+	"*.h"
+	"*.cpp"
+
+	[Test/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest]
+	(../Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest)
+	"*.h"
+	"*.cpp"
 
 	[Test/ExtensionsTest/ControlExtensionTest]
 	(../Classes/ExtensionsTest/ControlExtensionTest)