diff --git a/CocosDenshion/proj.uphone/CocosDenshion.uphone.vcproj b/CocosDenshion/proj.uphone/CocosDenshion.uphone.vcproj
index b8e5cd13b7..96940b0ef6 100644
--- a/CocosDenshion/proj.uphone/CocosDenshion.uphone.vcproj
+++ b/CocosDenshion/proj.uphone/CocosDenshion.uphone.vcproj
@@ -2,7 +2,7 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9.00"
-	Name="CocosDenshion_uphone"
+	Name="CocosDenshion"
 	ProjectGUID="{AB17438B-7848-4FD6-AF6E-A6A91F82C6F0}"
 	RootNamespace="CocosDenshion"
 	Keyword="Win32Proj"
diff --git a/HelloWorld.uphone/HelloWorld.cpp b/HelloWorld.uphone/HelloWorld.cpp
index 466ecb060b..cd6fc70690 100644
--- a/HelloWorld.uphone/HelloWorld.cpp
+++ b/HelloWorld.uphone/HelloWorld.cpp
@@ -37,7 +37,7 @@ public:
 // AppDelegate
 
 HelloWorldAppDelegate::HelloWorldAppDelegate() 
-, m_pMainWnd(NULL)
+:m_pMainWnd(NULL)
 {
 
 }
diff --git a/TestAudioEngine.uphone/TestAudioEngine.vcproj b/TestAudioEngine.uphone/TestAudioEngine.vcproj
index 192b7e167e..1febcc2a04 100644
--- a/TestAudioEngine.uphone/TestAudioEngine.vcproj
+++ b/TestAudioEngine.uphone/TestAudioEngine.vcproj
@@ -63,7 +63,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="WS2_32.Lib ..\..\PRJ_TG3\Common\SoftSupport\EosConfig.lib ..\..\PRJ_TG3\Common\SoftSupport\SoftSupport.lib ..\..\PRJ_TG3\Common\SoftSupport\TG3_DLL.lib libCocosDenishion.lib"
+				AdditionalDependencies="WS2_32.Lib ..\..\PRJ_TG3\Common\SoftSupport\EosConfig.lib ..\..\PRJ_TG3\Common\SoftSupport\SoftSupport.lib ..\..\PRJ_TG3\Common\SoftSupport\TG3_DLL.lib"
 				OutputFile="$(OutDir)/TestAudioEngine.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="../../PRJ_TG3/Common/ICU/lib;../../PRJ_TG3/Mtapi/Win32/lib;../../PRJ_TG3/LIB/Win32Lib;../../PRJ_TG3/Common/SoftSupport"
diff --git a/cocos2d-x.uphone.sln b/cocos2d-x.uphone.sln
index 6491ae1284..6d038247a3 100644
--- a/cocos2d-x.uphone.sln
+++ b/cocos2d-x.uphone.sln
@@ -1,87 +1,74 @@
 
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cocos2dx-uphone", "cocos2dx\cocos2dx-uphone.vcproj", "{6AC43F51-A036-4653-B910-BDDC346D15E7}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloWorld", "HelloWorld\HelloWorld.vcproj", "{90D08657-A80A-41CD-8AAC-3A3DC8C33041}"
-	ProjectSection(ProjectDependencies) = postProject
-		{6AC43F51-A036-4653-B910-BDDC346D15E7} = {6AC43F51-A036-4653-B910-BDDC346D15E7}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chipmunk", "chipmunk\chipmunk.vcproj", "{BA00DDF7-0F25-4C1E-B012-FA230C1F6463}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Box2D", "Box2D\Box2D.vcproj", "{83C75293-906B-432E-80B9-A0041043E380}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestAudioEngine", "TestAudioEngine\TestAudioEngine.vcproj", "{93D51450-73EC-48FA-9CFB-2095757678B1}"
-	ProjectSection(ProjectDependencies) = postProject
-		{AB17438B-7848-4FD6-AF6E-A6A91F82C6F0} = {AB17438B-7848-4FD6-AF6E-A6A91F82C6F0}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cocos2dSimpleGame", "Cocos2dSimpleGame\Cocos2dSimpleGame.vcproj", "{ADD7B173-FF61-45DA-BDE0-3E41600D21B0}"
-	ProjectSection(ProjectDependencies) = postProject
-		{6AC43F51-A036-4653-B910-BDDC346D15E7} = {6AC43F51-A036-4653-B910-BDDC346D15E7}
-		{AB17438B-7848-4FD6-AF6E-A6A91F82C6F0} = {AB17438B-7848-4FD6-AF6E-A6A91F82C6F0}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CocosDenshion_uphone", "CocosDenshion\CocosDenshion-uphone.vcproj", "{AB17438B-7848-4FD6-AF6E-A6A91F82C6F0}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cocosTemplate", "template\cocosTemplate.vcproj", "{A2338E7B-155B-4A3B-AB4B-518ECDD26564}"
+	ProjectSection(ProjectDependencies) = postProject
+		{6AC43F51-A036-4653-B910-BDDC346D15E7} = {6AC43F51-A036-4653-B910-BDDC346D15E7}
+	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_uphone", "tests\proj.uphone\test_uphone.vcproj", "{33819ACD-9774-4E68-AFBE-7A88BBA7B19D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Box2D", "Box2D\proj.uphone\Box2D.uphone.vcproj", "{83C75293-906B-432E-80B9-A0041043E380}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chipmunk", "chipmunk\proj.uphone\chipmunk.uphone.vcproj", "{BA00DDF7-0F25-4C1E-B012-FA230C1F6463}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cocos2d-uphone", "cocos2dx\proj.uphone\cocos2d-uphone.vcproj", "{6AC43F51-A036-4653-B910-BDDC346D15E7}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CocosDenshion", "CocosDenshion\proj.uphone\CocosDenshion.uphone.vcproj", "{AB17438B-7848-4FD6-AF6E-A6A91F82C6F0}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloWorld", "HelloWorld.uphone\HelloWorld.vcproj", "{90D08657-A80A-41CD-8AAC-3A3DC8C33041}"
+	ProjectSection(ProjectDependencies) = postProject
+		{6AC43F51-A036-4653-B910-BDDC346D15E7} = {6AC43F51-A036-4653-B910-BDDC346D15E7}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestAudioEngine", "TestAudioEngine.uphone\TestAudioEngine.vcproj", "{93D51450-73EC-48FA-9CFB-2095757678B1}"
+	ProjectSection(ProjectDependencies) = postProject
+		{AB17438B-7848-4FD6-AF6E-A6A91F82C6F0} = {AB17438B-7848-4FD6-AF6E-A6A91F82C6F0}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tests", "tests\proj.uphone\test.uphone.vcproj", "{33819ACD-9774-4E68-AFBE-7A88BBA7B19D}"
 	ProjectSection(ProjectDependencies) = postProject
 		{6AC43F51-A036-4653-B910-BDDC346D15E7} = {6AC43F51-A036-4653-B910-BDDC346D15E7}
 		{83C75293-906B-432E-80B9-A0041043E380} = {83C75293-906B-432E-80B9-A0041043E380}
 		{BA00DDF7-0F25-4C1E-B012-FA230C1F6463} = {BA00DDF7-0F25-4C1E-B012-FA230C1F6463}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aaa1.uphone", "aaa1\aaa1.uphone.vcproj", "{79EF9F30-3468-4A0E-A285-16E195DCA0C8}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
 		Release|Win32 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{6AC43F51-A036-4653-B910-BDDC346D15E7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6AC43F51-A036-4653-B910-BDDC346D15E7}.Debug|Win32.Build.0 = Debug|Win32
-		{6AC43F51-A036-4653-B910-BDDC346D15E7}.Release|Win32.ActiveCfg = Release|Win32
-		{6AC43F51-A036-4653-B910-BDDC346D15E7}.Release|Win32.Build.0 = Release|Win32
-		{90D08657-A80A-41CD-8AAC-3A3DC8C33041}.Debug|Win32.ActiveCfg = Debug|Win32
-		{90D08657-A80A-41CD-8AAC-3A3DC8C33041}.Debug|Win32.Build.0 = Debug|Win32
-		{90D08657-A80A-41CD-8AAC-3A3DC8C33041}.Release|Win32.ActiveCfg = Release|Win32
-		{90D08657-A80A-41CD-8AAC-3A3DC8C33041}.Release|Win32.Build.0 = Release|Win32
-		{BA00DDF7-0F25-4C1E-B012-FA230C1F6463}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BA00DDF7-0F25-4C1E-B012-FA230C1F6463}.Debug|Win32.Build.0 = Debug|Win32
-		{BA00DDF7-0F25-4C1E-B012-FA230C1F6463}.Release|Win32.ActiveCfg = Release|Win32
-		{BA00DDF7-0F25-4C1E-B012-FA230C1F6463}.Release|Win32.Build.0 = Release|Win32
-		{83C75293-906B-432E-80B9-A0041043E380}.Debug|Win32.ActiveCfg = Debug|Win32
-		{83C75293-906B-432E-80B9-A0041043E380}.Debug|Win32.Build.0 = Debug|Win32
-		{83C75293-906B-432E-80B9-A0041043E380}.Release|Win32.ActiveCfg = Release|Win32
-		{83C75293-906B-432E-80B9-A0041043E380}.Release|Win32.Build.0 = Release|Win32
-		{93D51450-73EC-48FA-9CFB-2095757678B1}.Debug|Win32.ActiveCfg = Debug|Win32
-		{93D51450-73EC-48FA-9CFB-2095757678B1}.Debug|Win32.Build.0 = Debug|Win32
-		{93D51450-73EC-48FA-9CFB-2095757678B1}.Release|Win32.ActiveCfg = Release|Win32
-		{93D51450-73EC-48FA-9CFB-2095757678B1}.Release|Win32.Build.0 = Release|Win32
-		{ADD7B173-FF61-45DA-BDE0-3E41600D21B0}.Debug|Win32.ActiveCfg = Debug|Win32
-		{ADD7B173-FF61-45DA-BDE0-3E41600D21B0}.Debug|Win32.Build.0 = Debug|Win32
-		{ADD7B173-FF61-45DA-BDE0-3E41600D21B0}.Release|Win32.ActiveCfg = Release|Win32
-		{ADD7B173-FF61-45DA-BDE0-3E41600D21B0}.Release|Win32.Build.0 = Release|Win32
-		{AB17438B-7848-4FD6-AF6E-A6A91F82C6F0}.Debug|Win32.ActiveCfg = Debug|Win32
-		{AB17438B-7848-4FD6-AF6E-A6A91F82C6F0}.Debug|Win32.Build.0 = Debug|Win32
-		{AB17438B-7848-4FD6-AF6E-A6A91F82C6F0}.Release|Win32.ActiveCfg = Release|Win32
-		{AB17438B-7848-4FD6-AF6E-A6A91F82C6F0}.Release|Win32.Build.0 = Release|Win32
 		{A2338E7B-155B-4A3B-AB4B-518ECDD26564}.Debug|Win32.ActiveCfg = Debug|Win32
 		{A2338E7B-155B-4A3B-AB4B-518ECDD26564}.Debug|Win32.Build.0 = Debug|Win32
 		{A2338E7B-155B-4A3B-AB4B-518ECDD26564}.Release|Win32.ActiveCfg = Release|Win32
 		{A2338E7B-155B-4A3B-AB4B-518ECDD26564}.Release|Win32.Build.0 = Release|Win32
+		{83C75293-906B-432E-80B9-A0041043E380}.Debug|Win32.ActiveCfg = Debug|Win32
+		{83C75293-906B-432E-80B9-A0041043E380}.Debug|Win32.Build.0 = Debug|Win32
+		{83C75293-906B-432E-80B9-A0041043E380}.Release|Win32.ActiveCfg = Release|Win32
+		{83C75293-906B-432E-80B9-A0041043E380}.Release|Win32.Build.0 = Release|Win32
+		{BA00DDF7-0F25-4C1E-B012-FA230C1F6463}.Debug|Win32.ActiveCfg = Debug|Win32
+		{BA00DDF7-0F25-4C1E-B012-FA230C1F6463}.Debug|Win32.Build.0 = Debug|Win32
+		{BA00DDF7-0F25-4C1E-B012-FA230C1F6463}.Release|Win32.ActiveCfg = Release|Win32
+		{BA00DDF7-0F25-4C1E-B012-FA230C1F6463}.Release|Win32.Build.0 = Release|Win32
+		{6AC43F51-A036-4653-B910-BDDC346D15E7}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6AC43F51-A036-4653-B910-BDDC346D15E7}.Debug|Win32.Build.0 = Debug|Win32
+		{6AC43F51-A036-4653-B910-BDDC346D15E7}.Release|Win32.ActiveCfg = Release|Win32
+		{6AC43F51-A036-4653-B910-BDDC346D15E7}.Release|Win32.Build.0 = Release|Win32
+		{AB17438B-7848-4FD6-AF6E-A6A91F82C6F0}.Debug|Win32.ActiveCfg = Debug|Win32
+		{AB17438B-7848-4FD6-AF6E-A6A91F82C6F0}.Debug|Win32.Build.0 = Debug|Win32
+		{AB17438B-7848-4FD6-AF6E-A6A91F82C6F0}.Release|Win32.ActiveCfg = Release|Win32
+		{AB17438B-7848-4FD6-AF6E-A6A91F82C6F0}.Release|Win32.Build.0 = Release|Win32
+		{90D08657-A80A-41CD-8AAC-3A3DC8C33041}.Debug|Win32.ActiveCfg = Debug|Win32
+		{90D08657-A80A-41CD-8AAC-3A3DC8C33041}.Debug|Win32.Build.0 = Debug|Win32
+		{90D08657-A80A-41CD-8AAC-3A3DC8C33041}.Release|Win32.ActiveCfg = Release|Win32
+		{90D08657-A80A-41CD-8AAC-3A3DC8C33041}.Release|Win32.Build.0 = Release|Win32
+		{93D51450-73EC-48FA-9CFB-2095757678B1}.Debug|Win32.ActiveCfg = Debug|Win32
+		{93D51450-73EC-48FA-9CFB-2095757678B1}.Debug|Win32.Build.0 = Debug|Win32
+		{93D51450-73EC-48FA-9CFB-2095757678B1}.Release|Win32.ActiveCfg = Release|Win32
+		{93D51450-73EC-48FA-9CFB-2095757678B1}.Release|Win32.Build.0 = Release|Win32
 		{33819ACD-9774-4E68-AFBE-7A88BBA7B19D}.Debug|Win32.ActiveCfg = Debug|Win32
 		{33819ACD-9774-4E68-AFBE-7A88BBA7B19D}.Debug|Win32.Build.0 = Debug|Win32
 		{33819ACD-9774-4E68-AFBE-7A88BBA7B19D}.Release|Win32.ActiveCfg = Release|Win32
 		{33819ACD-9774-4E68-AFBE-7A88BBA7B19D}.Release|Win32.Build.0 = Release|Win32
-		{79EF9F30-3468-4A0E-A285-16E195DCA0C8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{79EF9F30-3468-4A0E-A285-16E195DCA0C8}.Debug|Win32.Build.0 = Debug|Win32
-		{79EF9F30-3468-4A0E-A285-16E195DCA0C8}.Release|Win32.ActiveCfg = Release|Win32
-		{79EF9F30-3468-4A0E-A285-16E195DCA0C8}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/cocos2d-x.win32.sln b/cocos2d-x.win32.sln
index 7dea035115..a905deaa76 100644
--- a/cocos2d-x.win32.sln
+++ b/cocos2d-x.win32.sln
@@ -17,8 +17,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "box2d", "Box2D\proj.win32\B
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chipmunk", "chipmunk\proj.win32\chipmunk.win32.vcproj", "{207BC7A9-CCF1-4F2F-A04D-45F72242AE25}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cocos2d-x", "cocos2d-x\proj.win32\cocos2dx.win32.vcproj", "{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cocosdenshion", "CocosDenshion\proj.win32\CocosDenshion.win32.vcproj", "{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloWorld", "HelloWorld.win32\HelloWorld.win32.vcproj", "{B8BF9E81-35FD-4582-BA1C-B85FA365BABB}"
@@ -26,6 +24,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloWorld", "HelloWorld.wi
 		{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} = {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cocos2d", "cocos2dx\proj.win32\cocos2dx.win32.vcproj", "{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -48,10 +48,6 @@ Global
 		{207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Debug|Win32.Build.0 = Debug|Win32
 		{207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Release|Win32.ActiveCfg = Release|Win32
 		{207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Release|Win32.Build.0 = Release|Win32
-		{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Debug|Win32.Build.0 = Debug|Win32
-		{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|Win32.ActiveCfg = Release|Win32
-		{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|Win32.Build.0 = Release|Win32
 		{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Debug|Win32.ActiveCfg = Debug|Win32
 		{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Debug|Win32.Build.0 = Debug|Win32
 		{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Release|Win32.ActiveCfg = Release|Win32
@@ -60,6 +56,10 @@ Global
 		{B8BF9E81-35FD-4582-BA1C-B85FA365BABB}.Debug|Win32.Build.0 = Debug|Win32
 		{B8BF9E81-35FD-4582-BA1C-B85FA365BABB}.Release|Win32.ActiveCfg = Release|Win32
 		{B8BF9E81-35FD-4582-BA1C-B85FA365BABB}.Release|Win32.Build.0 = Release|Win32
+		{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Debug|Win32.Build.0 = Debug|Win32
+		{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|Win32.ActiveCfg = Release|Win32
+		{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/cocos2dx/include/CCLayer.h b/cocos2dx/include/CCLayer.h
index 44ddd1eddb..9ccd4c97d1 100644
--- a/cocos2dx/include/CCLayer.h
+++ b/cocos2dx/include/CCLayer.h
@@ -43,7 +43,6 @@ All features from CCNode are valid, plus the following new features:
 - It can receive iPhone Touches
 - It can receive Accelerometer input
 */
-// @todo public UIAccelerometerDelegate
 class CCX_DLL CCLayer : public CCNode, public CCTouchDelegate, public UIAccelerometerDelegate
 {
 public:
diff --git a/cocos2dx/include/CCUIAccelerometerDelegate.h b/cocos2dx/include/CCUIAccelerometerDelegate.h
index 5467a52ae1..516a6ce841 100644
--- a/cocos2dx/include/CCUIAccelerometerDelegate.h
+++ b/cocos2dx/include/CCUIAccelerometerDelegate.h
@@ -25,6 +25,37 @@ THE SOFTWARE.
 #ifndef __UIACCELEROMETER_DELEGATE_H__
 #define __UIACCELEROMETER_DELEGATE_H__
 
-#include "../platform/CCXUIAccelerometer_platform.h"
+#include "ccxCommon.h"
+
+namespace   cocos2d {
+/**
+@brief The device accelerometer reports values for each axis in units of g-force 
+*/
+typedef struct 
+{
+    double x;
+    double y;
+    double z;
+
+    double timestamp;
+} UIAcceleration;
+
+/**
+@brief 
+The UIAccelerometerDelegate defines a single method for
+receiving acceleration-related data from the system.
+*/
+class CCX_DLL UIAccelerometerDelegate
+{
+public:
+    virtual void didAccelerate(UIAcceleration* pAccelerationValue) {}
+
+    //! call the release() in child layer
+    virtual void AccelerometerDestroy(void) {}
+    //! call the retain() in child layer
+    virtual void AccelerometerKeep(void) {}
+};
+
+} //namespace   cocos2d 
 
 #endif
diff --git a/cocos2dx/proj.uphone/cocos2d-uphone.vcproj b/cocos2dx/proj.uphone/cocos2d-uphone.vcproj
new file mode 100644
index 0000000000..59ab1305b7
--- /dev/null
+++ b/cocos2dx/proj.uphone/cocos2d-uphone.vcproj
@@ -0,0 +1,1011 @@
+<?xml version="1.0" encoding="gb2312"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="cocos2d-uphone"
+	ProjectGUID="{6AC43F51-A036-4653-B910-BDDC346D15E7}"
+	RootNamespace="cocos2d-uphone"
+	Keyword="uPhoneProj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="../../../PRJ_TG3/LIB/Win32Lib"
+			IntermediateDirectory="Debug"
+			ConfigurationType="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\PRJ_TG3\Include\ThirdParty\iconv;..\..\..\PRJ_TG3\Include\ThirdParty\zlib;..\..\..\PRJ_TG3\Include\ThirdParty\libpng;..\..\..\PRJ_TG3\Include\ThirdParty\libjpeg;..\..\..\PRJ_TG3\Include\ThirdParty\libxml2;..\include;..\..\..\PRJ_TG3\Include;..\..\..\PRJ_TG3\Include\MTAPI;..\..\..\PRJ_TG3\Include\OpenGL;..\..\..\PRJ_TG3\Include\TCOM;..\..\..\PRJ_TG3\TG3\Include;..\..\..\PRJ_TG3\TG3\TG3_Implement;..\..\..\PRJ_TG3\EOS_SYS;..\..\..\PRJ_TG3\Common\SoftSupport;..\..\..\PRJ_TG3\Common\ICU\Include;..\"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_TRANZDA_VM_;SS_MAKEDLL;__TG3_PURE_DLL__;_USE_MATH_DEFINES"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				StructMemberAlignment="3"
+				TreatWChar_tAsBuiltInType="false"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+				DisableSpecificWarnings="4996"
+				ForcedIncludeFiles=""
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="WS2_32.Lib EosConfig.lib SoftSupport.lib TG3_DLL.lib libEGL.lib libTG3_EGL.lib libgles_cm.lib libxml2.lib zlib.lib libpng14-imp.lib ImageToolKit_d.lib libjpeg.lib"
+				OutputFile="$(OutDir)/libcocos2d.dll"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="../../../PRJ_TG3/Common/ICU/lib;../../../PRJ_TG3/Mtapi/Win32/lib;../../../PRJ_TG3/LIB/Win32Lib;../../../PRJ_TG3/Common/SoftSupport"
+				GenerateDebugInformation="true"
+				GenerateMapFile="true"
+				MapExports="true"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				ImportLibrary="$(OutDir)/libcocos2d.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\PRJ_TG3\Include;..\..\..\PRJ_TG3\Include\MTAPI;..\..\..\PRJ_TG3\Include\ThirdParty;..\..\..\PRJ_TG3\Include\TCOM;..\..\..\PRJ_TG3\TG3\Include;..\..\..\PRJ_TG3\TG3\TG3_Implement;..\..\..\PRJ_TG3\EOS_SYS;..\..\..\PRJ_TG3\Common\SoftSupport;..\..\..\PRJ_TG3\Common\ICU\Include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_TRANZDA_VM_;SS_MAKEDLL"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				StructMemberAlignment="3"
+				TreatWChar_tAsBuiltInType="false"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+				ForcedIncludeFiles=""
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="WS2_32.Lib EosConfig.lib SoftSupport.lib TG3_DLL.lib"
+				OutputFile="$(OutDir)/cocos2dx.dll"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="../../../PRJ_TG3/Common/ICU/lib;../../../PRJ_TG3/Mtapi/Win32/lib;../../../PRJ_TG3/LIB/Win32Lib;../../../PRJ_TG3/Common/SoftSupport"
+				GenerateDebugInformation="true"
+				GenerateMapFile="true"
+				MapExports="true"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				ImportLibrary="$(OutDir)/cocos2dx.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="actions"
+			>
+			<File
+				RelativePath="..\actions\CCAction.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\actions\CCActionManager.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\actions\CCCameraAction.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\actions\CCEaseAction.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\actions\CCGrid3DAction.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\actions\CCGridAction.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\actions\CCInstantAction.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\actions\CCIntervalAction.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\actions\CCPageTurn3DAction.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\actions\CCProgressTimerActions.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\actions\CCTiledGridAction.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="base_nodes"
+			>
+			<File
+				RelativePath="..\base_nodes\CCAtlasNode.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\base_nodes\CCNode.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="effects"
+			>
+			<File
+				RelativePath="..\effects\CCGrabber.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\effects\CCGrabber.h"
+				>
+			</File>
+			<File
+				RelativePath="..\effects\CCGrid.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\effects\CCGrid.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="include"
+			>
+			<File
+				RelativePath="..\include\CCAction.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\CCActionManager.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\CCAtlasNode.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\CCBitmapFontAtlas.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\CCCamera.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\CCCameraAction.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\ccConfig.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\CCDirector.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\CCDrawingPrimitives.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\CCEaseAction.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\CCGrid3DAction.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\CCGridAction.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\CCInstantAction.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\CCIntervalAction.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\CCLabel.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\CCLabelAtlas.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\CCLayer.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\ccMacros.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\CCMenu.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\CCMenuItem.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\CCMotionStreak.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\CCNode.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\CCPageTurn3DAction.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\CCPageTurnTransition.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\CCParallaxNode.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\CCParticleExamples.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\CCParticleSystem.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\CCPointParticleSystem.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\CCProgressTimer.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\CCProgressTimerActions.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\CCProtocols.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\CCQuadParticleSystem.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\CCRadialTransition.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\CCRenderTexture.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\CCRibbon.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\CCScene.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\CCScheduler.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\CCSprite.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\CCSpriteFrame.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\CCSpriteFrameCache.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\CCSpriteSheet.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\CCTexture2D.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\CCTextureAtlas.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\CCTextureCache.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\CCTiledGridAction.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\CCTileMapAtlas.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\CCTMXLayer.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\CCTMXObjectGroup.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\CCTMXTiledMap.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\CCTMXXMLParser.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\CCTouch.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\CCTouchDelegateProtocol.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\CCTouchDispatcher.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\CCTransition.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\ccTypes.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\CCUIAccelerometerDelegate.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\CCXApplication.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\ccxCommon.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\CCXEGLView.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\CCXFileUtils.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\CCXUIAccelerometer.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\CCXUIImage.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\CGAffineTransform.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\CGGeometry.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\cocos2d.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\NSAutoreleasePool.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\NSData.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\NSMutableArray.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\NSMutableDictionary.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\NSObject.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\NSSet.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\NSString.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\NSZone.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\selector_protocol.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="label_nodes"
+			>
+			<File
+				RelativePath="..\label_nodes\CCBitmapFontAtlas.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\label_nodes\CCLabel.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\label_nodes\CCLabelAtlas.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="layers_scenes_transition_nodes"
+			>
+			<File
+				RelativePath="..\layers_scenes_transitions_nodes\CCLayer.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\layers_scenes_transitions_nodes\CCPageTurnTransition.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\layers_scenes_transitions_nodes\CCRadialTransition.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\layers_scenes_transitions_nodes\CCScene.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\layers_scenes_transitions_nodes\CCTransition.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="menu_nodes"
+			>
+			<File
+				RelativePath="..\menu_nodes\CCMenu.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\menu_nodes\CCMenuItem.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="misc_nodes"
+			>
+			<File
+				RelativePath="..\misc_nodes\CCMotionStreak.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\misc_nodes\CCProgressTimer.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\misc_nodes\CCRenderTexture.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\misc_nodes\CCRibbon.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="particle_nodes"
+			>
+			<File
+				RelativePath="..\particle_nodes\CCParticleExamples.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\particle_nodes\CCParticleSystem.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\particle_nodes\CCPointParticleSystem.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\particle_nodes\CCQuadParticleSystem.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="sprite_nodes"
+			>
+			<File
+				RelativePath="..\sprite_nodes\CCSprite.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\sprite_nodes\CCSpriteFrame.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\sprite_nodes\CCSpriteFrameCache.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\sprite_nodes\CCSpriteSheet.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="support"
+			>
+			<File
+				RelativePath="..\support\base64.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\support\base64.h"
+				>
+			</File>
+			<File
+				RelativePath="..\support\CCProfiling.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\support\CCProfiling.h"
+				>
+			</File>
+			<File
+				RelativePath="..\support\CGPointExtension.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\support\TransformUtils.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\support\TransformUtils.h"
+				>
+			</File>
+			<Filter
+				Name="data_support"
+				>
+				<File
+					RelativePath="..\support\data_support\ccCArray.h"
+					>
+				</File>
+				<File
+					RelativePath="..\support\data_support\uthash.h"
+					>
+				</File>
+				<File
+					RelativePath="..\support\data_support\utlist.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="image_support"
+				>
+				<File
+					RelativePath="..\support\image_support\TGAlib.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\support\image_support\TGAlib.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="opengl_support"
+				>
+				<File
+					RelativePath="..\support\opengl_support\glu.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\support\opengl_support\glu.h"
+					>
+				</File>
+				<File
+					RelativePath="..\support\opengl_support\OpenGL_Internal.h"
+					>
+				</File>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="textures"
+			>
+			<File
+				RelativePath="..\textures\CCTexture2D.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\textures\CCTextureAtlas.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\textures\CCTextureCache.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="tileMap_parallax_nodes"
+			>
+			<File
+				RelativePath="..\tileMap_parallax_nodes\CCParallaxNode.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tileMap_parallax_nodes\CCTileMapAtlas.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tileMap_parallax_nodes\CCTMXLayer.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tileMap_parallax_nodes\CCTMXObjectGroup.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tileMap_parallax_nodes\CCTMXTiledMap.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tileMap_parallax_nodes\CCTMXXMLParser.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="touch_dispatcher"
+			>
+			<File
+				RelativePath="..\touch_dispatcher\CCTouchDispatcher.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\touch_dispatcher\CCTouchHandler.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\touch_dispatcher\CCTouchHandler.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="cocoa"
+			>
+			<File
+				RelativePath="..\cocoa\CGAffineTransform.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\cocoa\CGGeometry.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\cocoa\NSAutoreleasePool.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\cocoa\NSData.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\cocoa\NSObject.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\cocoa\NSSet.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\cocoa\NSZone.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="platform"
+			>
+			<File
+				RelativePath="..\platform\CCFileUtils_platform.h"
+				>
+			</File>
+			<File
+				RelativePath="..\platform\CCXApplication_platform.h"
+				>
+			</File>
+			<File
+				RelativePath="..\platform\CCXEGLView_platform.h"
+				>
+			</File>
+			<File
+				RelativePath="..\platform\CCXMath.h"
+				>
+			</File>
+			<File
+				RelativePath="..\platform\CCXUIAccelerometer_platform.h"
+				>
+			</File>
+			<File
+				RelativePath="..\platform\CCXUIImage_platform.h"
+				>
+			</File>
+			<File
+				RelativePath="..\platform\config_platform.h"
+				>
+			</File>
+			<File
+				RelativePath="..\platform\platform.h"
+				>
+			</File>
+			<Filter
+				Name="uphone"
+				>
+				<File
+					RelativePath="..\platform\uphone\CCTime.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\platform\uphone\CCTime.h"
+					>
+				</File>
+				<File
+					RelativePath="..\platform\uphone\CCXApplication_uphone.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\platform\uphone\CCXApplication_uphone.h"
+					>
+				</File>
+				<File
+					RelativePath="..\platform\uphone\CCXBitmapDC.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\platform\uphone\CCXBitmapDC.h"
+					>
+				</File>
+				<File
+					RelativePath="..\platform\uphone\CCXEGLView_uphone.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\platform\uphone\CCXEGLView_uphone.h"
+					>
+				</File>
+				<File
+					RelativePath="..\platform\uphone\CCXFileUtils_uphone.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\platform\uphone\CCXFileUtils_uphone.h"
+					>
+				</File>
+				<File
+					RelativePath="..\platform\uphone\CCXUIAccelerometer_uphone.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\platform\uphone\CCXUIAccelerometer_uphone.h"
+					>
+				</File>
+				<File
+					RelativePath="..\platform\uphone\CCXUIImage_uphone.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\platform\uphone\CCXUIImage_uphone.h"
+					>
+				</File>
+				<File
+					RelativePath="..\platform\uphone\Cocos2dTypes.h"
+					>
+				</File>
+				<File
+					RelativePath="..\platform\uphone\NewDeleteOp.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\platform\uphone\NSLock.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\platform\uphone\NSLock.h"
+					>
+				</File>
+				<File
+					RelativePath="..\platform\uphone\ZipUtils.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\platform\uphone\ZipUtils.h"
+					>
+				</File>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="makefile"
+			>
+			<File
+				RelativePath="..\Lib_Cocos2d_Arm_Uphone.TMK3"
+				>
+			</File>
+			<File
+				RelativePath="..\Makefile.ARM"
+				>
+			</File>
+		</Filter>
+		<File
+			RelativePath="..\CCamera.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\CCConfiguration.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\CCConfiguration.h"
+			>
+		</File>
+		<File
+			RelativePath="..\CCDirector.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\CCDrawingPrimitives.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\CCScheduler.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\cocos2d.cpp"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/cocos2dx/proj.uphone/cocos2d-x.uphone.vcproj b/cocos2dx/proj.uphone/cocos2d-x.uphone.vcproj
deleted file mode 100644
index 6879be0cd5..0000000000
--- a/cocos2dx/proj.uphone/cocos2d-x.uphone.vcproj
+++ /dev/null
@@ -1,1011 +0,0 @@
-<?xml version="1.0" encoding="gb2312"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="cocos2dx-uphone"
-	ProjectGUID="{6AC43F51-A036-4653-B910-BDDC346D15E7}"
-	RootNamespace="cocos2dx"
-	Keyword="uPhoneProj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="../../PRJ_TG3/LIB/Win32Lib"
-			IntermediateDirectory="Debug"
-			ConfigurationType="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\PRJ_TG3\Include\ThirdParty\iconv;..\..\PRJ_TG3\Include\ThirdParty\zlib;..\..\PRJ_TG3\Include\ThirdParty\libpng;..\..\PRJ_TG3\Include\ThirdParty\libjpeg;..\..\PRJ_TG3\Include\ThirdParty\libxml2;.\include;.\Res;..\..\PRJ_TG3\Include;..\..\PRJ_TG3\Include\MTAPI;..\..\PRJ_TG3\Include\OpenGL;..\..\PRJ_TG3\Include\TCOM;..\..\PRJ_TG3\TG3\Include;..\..\PRJ_TG3\TG3\TG3_Implement;..\..\PRJ_TG3\EOS_SYS;..\..\PRJ_TG3\Common\SoftSupport;..\..\PRJ_TG3\Common\ICU\Include;.\"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_TRANZDA_VM_;SS_MAKEDLL;__TG3_PURE_DLL__;_USE_MATH_DEFINES"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				StructMemberAlignment="3"
-				TreatWChar_tAsBuiltInType="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-				DisableSpecificWarnings="4996"
-				ForcedIncludeFiles=""
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="WS2_32.Lib EosConfig.lib SoftSupport.lib TG3_DLL.lib libEGL.lib libTG3_EGL.lib libgles_cm.lib libxml2.lib zlib.lib libpng14-imp.lib ImageToolKit_d.lib libjpeg.lib"
-				OutputFile="$(OutDir)/libcocos2d.dll"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="../../PRJ_TG3/Common/ICU/lib;../../PRJ_TG3/Mtapi/Win32/lib;../../PRJ_TG3/LIB/Win32Lib;../../PRJ_TG3/Common/SoftSupport"
-				GenerateDebugInformation="true"
-				GenerateMapFile="true"
-				MapExports="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(OutDir)/libcocos2d.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories=".\Res;..\..\..\PRJ_TG3\Include;..\..\..\PRJ_TG3\Include\MTAPI;..\..\..\PRJ_TG3\Include\ThirdParty;..\..\..\PRJ_TG3\Include\TCOM;..\..\..\PRJ_TG3\TG3\Include;..\..\..\PRJ_TG3\TG3\TG3_Implement;..\..\..\PRJ_TG3\EOS_SYS;..\..\..\PRJ_TG3\Common\SoftSupport;..\..\..\PRJ_TG3\Common\ICU\Include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_TRANZDA_VM_;SS_MAKEDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				StructMemberAlignment="3"
-				TreatWChar_tAsBuiltInType="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-				ForcedIncludeFiles=""
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="WS2_32.Lib EosConfig.lib SoftSupport.lib TG3_DLL.lib"
-				OutputFile="$(OutDir)/cocos2dx.dll"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="../../../PRJ_TG3/Common/ICU/lib;../../../PRJ_TG3/Mtapi/Win32/lib;../../../PRJ_TG3/LIB/Win32Lib;../../../PRJ_TG3/Common/SoftSupport"
-				GenerateDebugInformation="true"
-				GenerateMapFile="true"
-				MapExports="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(OutDir)/cocos2dx.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="actions"
-			>
-			<File
-				RelativePath=".\actions\CCAction.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\actions\CCActionManager.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\actions\CCCameraAction.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\actions\CCEaseAction.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\actions\CCGrid3DAction.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\actions\CCGridAction.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\actions\CCInstantAction.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\actions\CCIntervalAction.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\actions\CCPageTurn3DAction.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\actions\CCProgressTimerActions.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\actions\CCTiledGridAction.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="base_nodes"
-			>
-			<File
-				RelativePath=".\base_nodes\CCAtlasNode.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\base_nodes\CCNode.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="effects"
-			>
-			<File
-				RelativePath=".\effects\CCGrabber.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\effects\CCGrabber.h"
-				>
-			</File>
-			<File
-				RelativePath=".\effects\CCGrid.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\effects\CCGrid.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="include"
-			>
-			<File
-				RelativePath=".\include\CCAction.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\CCActionManager.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\CCAtlasNode.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\CCBitmapFontAtlas.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\CCCamera.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\CCCameraAction.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\ccConfig.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\CCDirector.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\CCDrawingPrimitives.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\CCEaseAction.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\CCGrid3DAction.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\CCGridAction.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\CCInstantAction.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\CCIntervalAction.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\CCLabel.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\CCLabelAtlas.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\CCLayer.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\ccMacros.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\CCMenu.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\CCMenuItem.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\CCMotionStreak.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\CCNode.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\CCPageTurn3DAction.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\CCPageTurnTransition.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\CCParallaxNode.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\CCParticleExamples.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\CCParticleSystem.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\CCPointParticleSystem.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\CCProgressTimer.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\CCProgressTimerActions.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\CCProtocols.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\CCQuadParticleSystem.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\CCRadialTransition.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\CCRenderTexture.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\CCRibbon.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\CCScene.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\CCScheduler.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\CCSprite.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\CCSpriteFrame.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\CCSpriteFrameCache.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\CCSpriteSheet.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\CCTexture2D.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\CCTextureAtlas.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\CCTextureCache.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\CCTiledGridAction.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\CCTileMapAtlas.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\CCTMXLayer.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\CCTMXObjectGroup.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\CCTMXTiledMap.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\CCTMXXMLParser.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\CCTouch.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\CCTouchDelegateProtocol.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\CCTouchDispatcher.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\CCTransition.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\ccTypes.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\CCUIAccelerometerDelegate.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\CCXApplication.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\ccxCommon.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\CCXEGLView.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\CCXFileUtils.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\CCXUIAccelerometer.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\CCXUIImage.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\CGAffineTransform.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\CGGeometry.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\cocos2d.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\NSAutoreleasePool.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\NSData.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\NSMutableArray.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\NSMutableDictionary.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\NSObject.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\NSSet.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\NSString.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\NSZone.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\selector_protocol.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="label_nodes"
-			>
-			<File
-				RelativePath=".\label_nodes\CCBitmapFontAtlas.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\label_nodes\CCLabel.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\label_nodes\CCLabelAtlas.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="layers_scenes_transition_nodes"
-			>
-			<File
-				RelativePath=".\layers_scenes_transitions_nodes\CCLayer.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\layers_scenes_transitions_nodes\CCPageTurnTransition.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\layers_scenes_transitions_nodes\CCRadialTransition.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\layers_scenes_transitions_nodes\CCScene.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\layers_scenes_transitions_nodes\CCTransition.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="menu_nodes"
-			>
-			<File
-				RelativePath=".\menu_nodes\CCMenu.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\menu_nodes\CCMenuItem.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="misc_nodes"
-			>
-			<File
-				RelativePath=".\misc_nodes\CCMotionStreak.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\misc_nodes\CCProgressTimer.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\misc_nodes\CCRenderTexture.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\misc_nodes\CCRibbon.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="particle_nodes"
-			>
-			<File
-				RelativePath=".\particle_nodes\CCParticleExamples.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\particle_nodes\CCParticleSystem.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\particle_nodes\CCPointParticleSystem.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\particle_nodes\CCQuadParticleSystem.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="sprite_nodes"
-			>
-			<File
-				RelativePath=".\sprite_nodes\CCSprite.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\sprite_nodes\CCSpriteFrame.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\sprite_nodes\CCSpriteFrameCache.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\sprite_nodes\CCSpriteSheet.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="support"
-			>
-			<File
-				RelativePath=".\support\base64.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\support\base64.h"
-				>
-			</File>
-			<File
-				RelativePath=".\support\CCProfiling.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\support\CCProfiling.h"
-				>
-			</File>
-			<File
-				RelativePath=".\support\CGPointExtension.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\support\TransformUtils.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\support\TransformUtils.h"
-				>
-			</File>
-			<Filter
-				Name="data_support"
-				>
-				<File
-					RelativePath=".\support\data_support\ccCArray.h"
-					>
-				</File>
-				<File
-					RelativePath=".\support\data_support\uthash.h"
-					>
-				</File>
-				<File
-					RelativePath=".\support\data_support\utlist.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="image_support"
-				>
-				<File
-					RelativePath=".\support\image_support\TGAlib.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\support\image_support\TGAlib.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="opengl_support"
-				>
-				<File
-					RelativePath=".\support\opengl_support\glu.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\support\opengl_support\glu.h"
-					>
-				</File>
-				<File
-					RelativePath=".\support\opengl_support\OpenGL_Internal.h"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="textures"
-			>
-			<File
-				RelativePath=".\textures\CCTexture2D.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\textures\CCTextureAtlas.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\textures\CCTextureCache.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="tileMap_parallax_nodes"
-			>
-			<File
-				RelativePath=".\tileMap_parallax_nodes\CCParallaxNode.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\tileMap_parallax_nodes\CCTileMapAtlas.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\tileMap_parallax_nodes\CCTMXLayer.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\tileMap_parallax_nodes\CCTMXObjectGroup.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\tileMap_parallax_nodes\CCTMXTiledMap.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\tileMap_parallax_nodes\CCTMXXMLParser.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="touch_dispatcher"
-			>
-			<File
-				RelativePath=".\touch_dispatcher\CCTouchDispatcher.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\touch_dispatcher\CCTouchHandler.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\touch_dispatcher\CCTouchHandler.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="cocoa"
-			>
-			<File
-				RelativePath=".\cocoa\CGAffineTransform.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\cocoa\CGGeometry.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\cocoa\NSAutoreleasePool.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\cocoa\NSData.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\cocoa\NSObject.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\cocoa\NSSet.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\cocoa\NSZone.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="platform"
-			>
-			<File
-				RelativePath=".\platform\CCFileUtils_platform.h"
-				>
-			</File>
-			<File
-				RelativePath=".\platform\CCXApplication_platform.h"
-				>
-			</File>
-			<File
-				RelativePath=".\platform\CCXEGLView_platform.h"
-				>
-			</File>
-			<File
-				RelativePath=".\platform\CCXMath.h"
-				>
-			</File>
-			<File
-				RelativePath=".\platform\CCXUIAccelerometer_platform.h"
-				>
-			</File>
-			<File
-				RelativePath=".\platform\CCXUIImage_platform.h"
-				>
-			</File>
-			<File
-				RelativePath=".\platform\config_platform.h"
-				>
-			</File>
-			<File
-				RelativePath=".\platform\platform.h"
-				>
-			</File>
-			<Filter
-				Name="uphone"
-				>
-				<File
-					RelativePath=".\platform\uphone\CCTime.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\platform\uphone\CCTime.h"
-					>
-				</File>
-				<File
-					RelativePath=".\platform\uphone\CCXApplication_uphone.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\platform\uphone\CCXApplication_uphone.h"
-					>
-				</File>
-				<File
-					RelativePath=".\platform\uphone\CCXBitmapDC.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\platform\uphone\CCXBitmapDC.h"
-					>
-				</File>
-				<File
-					RelativePath=".\platform\uphone\CCXEGLView_uphone.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\platform\uphone\CCXEGLView_uphone.h"
-					>
-				</File>
-				<File
-					RelativePath=".\platform\uphone\CCXFileUtils_uphone.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\platform\uphone\CCXFileUtils_uphone.h"
-					>
-				</File>
-				<File
-					RelativePath=".\platform\uphone\CCXUIAccelerometer_uphone.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\platform\uphone\CCXUIAccelerometer_uphone.h"
-					>
-				</File>
-				<File
-					RelativePath=".\platform\uphone\CCXUIImage_uphone.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\platform\uphone\CCXUIImage_uphone.h"
-					>
-				</File>
-				<File
-					RelativePath=".\platform\uphone\Cocos2dTypes.h"
-					>
-				</File>
-				<File
-					RelativePath=".\platform\uphone\NewDeleteOp.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\platform\uphone\NSLock.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\platform\uphone\NSLock.h"
-					>
-				</File>
-				<File
-					RelativePath=".\platform\uphone\ZipUtils.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\platform\uphone\ZipUtils.h"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="makefile"
-			>
-			<File
-				RelativePath=".\Lib_Cocos2d_Arm_Uphone.TMK3"
-				>
-			</File>
-			<File
-				RelativePath=".\Makefile.ARM"
-				>
-			</File>
-		</Filter>
-		<File
-			RelativePath=".\CCamera.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\CCConfiguration.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\CCConfiguration.h"
-			>
-		</File>
-		<File
-			RelativePath=".\CCDirector.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\CCDrawingPrimitives.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\CCScheduler.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\cocos2d.cpp"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/cocos2dx/proj.win32/cocos2dx.win32.vcproj b/cocos2dx/proj.win32/cocos2dx.win32.vcproj
index 7001c466a9..0b64ce927e 100644
--- a/cocos2dx/proj.win32/cocos2dx.win32.vcproj
+++ b/cocos2dx/proj.win32/cocos2dx.win32.vcproj
@@ -2,7 +2,7 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9.00"
-	Name="cocos2d-x"
+	Name="cocos2d-win32"
 	ProjectGUID="{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}"
 	RootNamespace="cocos2d-x.win32"
 	Keyword="Win32Proj"
diff --git a/tests/proj.uphone/test.uphone.vcproj b/tests/proj.uphone/test.uphone.vcproj
index 6d7045fde8..467d5fa15d 100644
--- a/tests/proj.uphone/test.uphone.vcproj
+++ b/tests/proj.uphone/test.uphone.vcproj
@@ -2,7 +2,7 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9.00"
-	Name="test_uphone"
+	Name="tests"
 	ProjectGUID="{33819ACD-9774-4E68-AFBE-7A88BBA7B19D}"
 	RootNamespace="test_uphone"
 	TargetFrameworkVersion="131072"
@@ -67,7 +67,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="WS2_32.Lib EosConfig.lib SoftSupport.lib TG3_DLL.lib libcocos2d.lib libEGL.lib libgles_cm.lib libBox2d.lib"
-				OutputFile="$(OutDir)/test_uphone.dll"
+				OutputFile="$(OutDir)/libCocos2dTests.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="../../../PRJ_TG3/Common/ICU/lib;../../../PRJ_TG3/Mtapi/Win32/lib;../../../PRJ_TG3/LIB/Win32Lib;../../../PRJ_TG3/Common/SoftSupport;&quot;$(OutDir)&quot;"
 				GenerateDebugInformation="true"
diff --git a/tests/proj.win32/test.win32.vcproj b/tests/proj.win32/test.win32.vcproj
index 7388f8f962..74a7c1910f 100644
--- a/tests/proj.win32/test.win32.vcproj
+++ b/tests/proj.win32/test.win32.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;..\..\cocos2d-x&quot;;&quot;..\..\cocos2d-x\include&quot;;..\..\;..\..\chipmunk\include\chipmunk;...\tests;&quot;..\..\cocos2d-x\platform\win32\third_party\OGLES\&quot;"
+				AdditionalIncludeDirectories="..\..\cocos2dx;..\..\cocos2dx\include;..\..\;..\..\chipmunk\include\chipmunk;..\tests;..\..\cocos2dx\platform\win32\third_party\OGLES\"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USE_MATH_DEFINES;GL_GLEXT_PROTOTYPES"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -120,7 +120,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="&quot;..\..\cocos2d-x&quot;;&quot;..\..\cocos2d-x\include&quot;;..\..\;..\..\chipmunk\include\chipmunk;...\tests;&quot;..\..\cocos2d-x\platform\win32\third_party\OGLES\&quot;"
+				AdditionalIncludeDirectories="..\..\cocos2dx;..\..\cocos2dx\include;..\..\;..\..\chipmunk\include\chipmunk;..\tests;..\..\cocos2dx\platform\win32\third_party\OGLES\"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USE_MATH_DEFINES;GL_GLEXT_PROTOTYPES"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"