diff --git a/Box2D/proj.wophone/Box2D.TMK3 b/Box2D/proj.wophone/Box2D.TMK3
index 67a276bc96b1..8bdfcc680487 100644
--- a/Box2D/proj.wophone/Box2D.TMK3
+++ b/Box2D/proj.wophone/Box2D.TMK3
@@ -29,7 +29,7 @@ INCLUDE_TMK3=$(TO_PROJECT_ROOT)/MakeInclude/TG3_APP_Arm.TMK3		;TOPS
 ;PRE_DEFINE=USE_MTAPI=1			;使用 MTAPI 库，此时生成的 Makefile 会自动连接有关的LIB
 
 ;C、C++预定义宏，可以使用多个DEFINES串，也可以使用DEFINES1、DEFINES2等方式，MakeFile中依据出现顺序(不是数字大小)排列
-DEFINES=-DCCX_UNDER_WOPHONE		;这里填入应用的自定义宏。注意：ITOPS自己的所需定义会自动包含，故此这里仅仅包含应用自己特有的定义即可
+DEFINES=-DCC_UNDER_WOPHONE		;这里填入应用的自定义宏。注意：ITOPS自己的所需定义会自动包含，故此这里仅仅包含应用自己特有的定义即可
 ;DEFINES=-D__TG3_PURE_DLL__		;生成的是纯动态库（意思是：不是TOPS应用，但可以是TCOM组件）
 ;DEFINES=-D__TCOM_SUPPORT__		;生成的是TCOM组件（注意：TOPS应用也可以同时是TCOM组件）
 
diff --git a/Box2D/proj.wophone/Makefile.ARM b/Box2D/proj.wophone/Makefile.ARM
index c93b3a6a4be2..cde6a59d152c 100644
--- a/Box2D/proj.wophone/Makefile.ARM
+++ b/Box2D/proj.wophone/Makefile.ARM
@@ -12,7 +12,7 @@ OUTPUT_FILENAME = libBox2DStatic.a
 include $(TO_PROJECT_ROOT)/MakeInclude/Makefile_Base_StaticLib.ARM
 include $(TO_PROJECT_ROOT)/MakeInclude/Makefile_TOPS_Def.ARM
 
-DEFINES += -DCCX_UNDER_WOPHONE
+DEFINES += -DCC_UNDER_WOPHONE
 INCLUDE_PATH += -I../ -I../../
 
 CXX_FLAGS += -fvisibility=default
diff --git a/CocosDenshion/proj.wophone/Makefile.ARM b/CocosDenshion/proj.wophone/Makefile.ARM
index 59029e342d3d..53cf312251a8 100644
--- a/CocosDenshion/proj.wophone/Makefile.ARM
+++ b/CocosDenshion/proj.wophone/Makefile.ARM
@@ -12,7 +12,7 @@ OUTPUT_FILENAME = libCocosDenshionStatic.a
 include $(TO_PROJECT_ROOT)/MakeInclude/Makefile_Base_StaticLib.ARM
 include $(TO_PROJECT_ROOT)/MakeInclude/Makefile_TOPS_Def.ARM
 
-DEFINES += -DCCX_UNDER_WOPHONE \
+DEFINES += -DCC_UNDER_WOPHONE \
           -D__TG3_PURE_DLL__ \
           -DUSE_FILE32API
 INCLUDE_PATH += -I../ \
diff --git a/CocosDenshion/proj.wophone/SimpleAudioEngine_Arm_wophone.TMK3 b/CocosDenshion/proj.wophone/SimpleAudioEngine_Arm_wophone.TMK3
index 92fa6a5505bc..ec7ea89b84e4 100644
--- a/CocosDenshion/proj.wophone/SimpleAudioEngine_Arm_wophone.TMK3
+++ b/CocosDenshion/proj.wophone/SimpleAudioEngine_Arm_wophone.TMK3
@@ -29,7 +29,7 @@ INCLUDE_TMK3=$(TO_PROJECT_ROOT)/MakeInclude/TG3_LIB_Arm.TMK3		;TOPS
 ;PRE_DEFINE=USE_MTAPI=1			;使用 MTAPI 库，此时生成的 Makefile 会自动连接有关的LIB
 
 ;C、C++预定义宏，可以使用多个DEFINES串，也可以使用DEFINES1、DEFINES2等方式，MakeFile中依据出现顺序(不是数字大小)排列
-DEFINES=-DCCX_UNDER_WOPHONE				;是wophone环境下的makefile
+DEFINES=-DCC_UNDER_WOPHONE				;是wophone环境下的makefile
 DEFINES=-D__TG3_PURE_DLL__		;生成的是纯动态库（意思是：不是TOPS应用，但可以是TCOM组件）
 DEFINES=-DUSE_FILE32API
 
diff --git a/HelloWorld/wophone/HelloWorld.TMK3 b/HelloWorld/wophone/HelloWorld.TMK3
index c5a377129bdb..665af33f76d6 100644
--- a/HelloWorld/wophone/HelloWorld.TMK3
+++ b/HelloWorld/wophone/HelloWorld.TMK3
@@ -29,15 +29,15 @@ INCLUDE_TMK3=$(TO_PROJECT_ROOT)/MakeInclude/TG3_APP_Arm.TMK3		;TOPS
 ;PRE_DEFINE=USE_MTAPI=1			;使用 MTAPI 库，此时生成的 Makefile 会自动连接有关的LIB
 
 ;C、C++预定义宏，可以使用多个DEFINES串，也可以使用DEFINES1、DEFINES2等方式，MakeFile中依据出现顺序(不是数字大小)排列
-DEFINES=-DCCX_UNDER_WOPHONE		;这里填入应用的自定义宏。注意：ITOPS自己的所需定义会自动包含，故此这里仅仅包含应用自己特有的定义即可
+DEFINES=-DCC_UNDER_WOPHONE		;这里填入应用的自定义宏。注意：ITOPS自己的所需定义会自动包含，故此这里仅仅包含应用自己特有的定义即可
 ;DEFINES=-D__TG3_PURE_DLL__		;生成的是纯动态库（意思是：不是TOPS应用，但可以是TCOM组件）
 ;DEFINES=-D__TCOM_SUPPORT__		;生成的是TCOM组件（注意：TOPS应用也可以同时是TCOM组件）
 
 ;包含路径，可以使用多个INCLUDE_PATH串，也可以使用INCLUDE_PATH1、INCLUDE_PATH2等方式，MakeFile中依据出现顺序(不是数字大小)排列
-INCLUDE_PATH=-I./Res -I../ -I../wophone -I../cocos2dx -I../cocos2dx/include -I../platform_support/include		;应用额外的包含路径。注意：ITOPS自己的所有路径都会自动包含，故此这里仅仅包含应用自己特有的路径即可
+INCLUDE_PATH=-I./Res -I../ -I../wophone -I../cocos2dx -I../cocos2dx/include	-I../cocos2dx/platform	;应用额外的包含路径。注意：ITOPS自己的所有路径都会自动包含，故此这里仅仅包含应用自己特有的路径即可
 
 ;连接的库文件，可以使用多个LIBS串，也可以使用LIBS1、LIBS2等方式，MakeFile中依据出现顺序(不是数字大小)排列
-LIBS=-lCocos2dStatic -lPlatformSupportStatic -lTG3_GLESv1_CM -lTG3_EGL -lz -lxml2 -lpng14 -lImageToolKit -ljpeg		;应用额外的连接库。注意：ITOPS自己的所需库自动包含，而且库包含路径也已经包含，故此这里仅仅包含应用自己特有的库的名字即可
+LIBS=-lCocos2dStatic -lTG3_GLESv1_CM -lTG3_EGL -lz -lxml2 -lpng14 -lImageToolKit -ljpeg		;应用额外的连接库。注意：ITOPS自己的所需库自动包含，而且库包含路径也已经包含，故此这里仅仅包含应用自己特有的库的名字即可
 
 ;强制包含文件的名字，不能使用通配符，一定要使用相对或者绝对路径
 ;极力要求使用相对路径，多个文件之间使用“|”分隔
diff --git a/HelloWorld/wophone/Makefile.ARM b/HelloWorld/wophone/Makefile.ARM
index 538c995f96cd..3e516a8b6bba 100644
--- a/HelloWorld/wophone/Makefile.ARM
+++ b/HelloWorld/wophone/Makefile.ARM
@@ -12,14 +12,14 @@ OUTPUT_FILENAME = libHelloWorld.so
 include $(TO_PROJECT_ROOT)/MakeInclude/Makefile_Base_DynamicLib.ARM
 include $(TO_PROJECT_ROOT)/MakeInclude/Makefile_TOPS_Def.ARM
 
-DEFINES += -DCCX_UNDER_WOPHONE
+DEFINES += -DCC_UNDER_WOPHONE
 INCLUDE_PATH += -I./Res  \
-								-I../    \
-								-I../wophone \
+                -I../    \
+                -I../wophone \
                 -I../../cocos2dx \
                 -I../../cocos2dx/include \
-                -I../../platform_support/include
-LIBS += -lCocos2dStatic -lPlatformSupportStatic -lTG3_GLESv1_CM -lTG3_EGL -lz -lxml2 -lpng14 -lImageToolKit -ljpeg
+                -I../../cocos2dx/platform
+LIBS += -lCocos2dStatic -lTG3_GLESv1_CM -lTG3_EGL -lz -lxml2 -lpng14 -lImageToolKit -ljpeg
 
 OBJECTS_DIR = ./Debug-ARM
 DESTDIR = $(TO_PROJECT_ROOT)/$(BIN_OUTPUT_DIR)
diff --git a/build-wophone.sh b/build-wophone.sh
index fa635cb44709..df82fb6098be 100644
--- a/build-wophone.sh
+++ b/build-wophone.sh
@@ -8,11 +8,6 @@ make -f Makefile.ARM clean
 make -f Makefile.ARM all
 popd
 
-pushd ./platform_support/proj.wophone
-make -f Makefile.ARM clean
-make -f Makefile.ARM all
-popd
-
 pushd ./cocos2dx/proj.wophone
 make -f Makefile.ARM clean
 make -f Makefile.ARM all
diff --git a/chipmunk/proj.wophone/Makefile.ARM b/chipmunk/proj.wophone/Makefile.ARM
index 8319ddc6ed6e..38f4fb6cbd08 100644
--- a/chipmunk/proj.wophone/Makefile.ARM
+++ b/chipmunk/proj.wophone/Makefile.ARM
@@ -12,7 +12,7 @@ OUTPUT_FILENAME = libChipmunkStatic.a
 include $(TO_PROJECT_ROOT)/MakeInclude/Makefile_Base_StaticLib.ARM
 include $(TO_PROJECT_ROOT)/MakeInclude/Makefile_TOPS_Def.ARM
 
-DEFINES += -DCCX_UNDER_WOPHONE
+DEFINES += -DCC_UNDER_WOPHONE
 INCLUDE_PATH += -I../  \
                -I../../cocos2dx	-I../../cocos2dx/include \
                -I../include -I../include/chipmunk -I../include/chipmunk/contains \
diff --git a/chipmunk/proj.wophone/chipmunk.TMK3 b/chipmunk/proj.wophone/chipmunk.TMK3
index b181b046f554..ca7b34100a5c 100644
--- a/chipmunk/proj.wophone/chipmunk.TMK3
+++ b/chipmunk/proj.wophone/chipmunk.TMK3
@@ -29,7 +29,7 @@ INCLUDE_TMK3=$(TO_PROJECT_ROOT)/MakeInclude/TG3_APP_Arm.TMK3		;TOPS
 ;PRE_DEFINE=USE_MTAPI=1			;使用 MTAPI 库，此时生成的 Makefile 会自动连接有关的LIB
 
 ;C、C++预定义宏，可以使用多个DEFINES串，也可以使用DEFINES1、DEFINES2等方式，MakeFile中依据出现顺序(不是数字大小)排列
-DEFINES=-DCCX_UNDER_WOPHONE		;这里填入应用的自定义宏。注意：ITOPS自己的所需定义会自动包含，故此这里仅仅包含应用自己特有的定义即可
+DEFINES=-DCC_UNDER_WOPHONE		;这里填入应用的自定义宏。注意：ITOPS自己的所需定义会自动包含，故此这里仅仅包含应用自己特有的定义即可
 ;DEFINES=-D__TG3_PURE_DLL__		;生成的是纯动态库（意思是：不是TOPS应用，但可以是TCOM组件）
 ;DEFINES=-D__TCOM_SUPPORT__		;生成的是TCOM组件（注意：TOPS应用也可以同时是TCOM组件）
 
diff --git a/cocos2dx/platform/CCStdC.h b/cocos2dx/platform/CCStdC.h
index 09df82a47a44..e28745b86ad8 100644
--- a/cocos2dx/platform/CCStdC.h
+++ b/cocos2dx/platform/CCStdC.h
@@ -54,6 +54,12 @@ THE SOFTWARE.
 
 #endif // CC_TARGET_PLATFORM == CC_PLATFORM_WOPHONE && defined(_TRANZDA_VM_)
 
+#if (CC_TARGET_PLATFORM == CC_PLATFORM_WOPHONE)
+
+#include "TG3.h"
+
+#endif  // CC_PLATFORM_WOPHONE
+
 #include <math.h>
 
 #include <string.h>
@@ -81,12 +87,6 @@ int CC_DLL gettimeofday(struct timeval *, struct timezone *);
 
 #endif  // CC_PLATFORM_WIN32
 
-#if (CC_TARGET_PLATFORM == CC_PLATFORM_WOPHONE)
-
-#include "TG3.h"
-
-#endif  // CC_PLATFORM_WOPHONE
-
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
 
 #include <sys/time.h>
diff --git a/cocos2dx/proj.wophone/Makefile.ARM b/cocos2dx/proj.wophone/Makefile.ARM
index 71f0cfead011..2626020f1d91 100644
--- a/cocos2dx/proj.wophone/Makefile.ARM
+++ b/cocos2dx/proj.wophone/Makefile.ARM
@@ -12,11 +12,11 @@ OUTPUT_FILENAME =  libCocos2dStatic.a
 include $(TO_PROJECT_ROOT)/MakeInclude/Makefile_Base_StaticLib.ARM
 include $(TO_PROJECT_ROOT)/MakeInclude/Makefile_TOPS_Def.ARM
 
-DEFINES += -DCCX_UNDER_WOPHONE \
+DEFINES += -DCC_UNDER_WOPHONE \
           -D__TG3_PURE_DLL__ \
           -DUSE_FILE32API
 INCLUDE_PATH += -I../ \
-               -I../../platform_support/include \
+               -I../platform \
                -I../include -I$(TO_PROJECT_ROOT)/Include/ThirdParty/libxml2 \
                -I$(TO_PROJECT_ROOT)/Include/ThirdParty/iconv \
                -I$(TO_PROJECT_ROOT)/Include/ThirdParty/libpng \
@@ -49,13 +49,13 @@ OBJECTS = \
 	$(OBJECTS_DIR)/CCActionProgressTimer.o \
 	$(OBJECTS_DIR)/CCActionTiledGrid.o \
 	$(OBJECTS_DIR)/CCAtlasNode.o \
-	$(OBJECTS_DIR)/CGAffineTransform.o \
-	$(OBJECTS_DIR)/CGGeometry.o \
-	$(OBJECTS_DIR)/NSAutoreleasePool.o \
-	$(OBJECTS_DIR)/NSData.o \
-	$(OBJECTS_DIR)/NSObject.o \
-	$(OBJECTS_DIR)/NSSet.o \
-	$(OBJECTS_DIR)/NSZone.o \
+	$(OBJECTS_DIR)/CCAffineTransform.o \
+	$(OBJECTS_DIR)/CCAutoreleasePool.o \
+	$(OBJECTS_DIR)/CCData.o \
+	$(OBJECTS_DIR)/CCGeometry.o \
+	$(OBJECTS_DIR)/CCObject.o \
+	$(OBJECTS_DIR)/CCSet.o \
+	$(OBJECTS_DIR)/CCZone.o \
 	$(OBJECTS_DIR)/CCGrabber.o \
 	$(OBJECTS_DIR)/CCEventDispatcher.o \
 	$(OBJECTS_DIR)/CCKeyboardEventDelegate.o \
@@ -76,19 +76,25 @@ OBJECTS = \
 	$(OBJECTS_DIR)/CCParticleExamples.o \
 	$(OBJECTS_DIR)/CCParticleSystem.o \
 	$(OBJECTS_DIR)/CCParticleSystemQuad.o \
+	$(OBJECTS_DIR)/CCCommon.o \
 	$(OBJECTS_DIR)/CCDirector_mobile.o \
+	$(OBJECTS_DIR)/CCGL.o \
 	$(OBJECTS_DIR)/CCGrid_mobile.o \
+	$(OBJECTS_DIR)/CCImage.o \
 	$(OBJECTS_DIR)/CCLayer_mobile.o \
 	$(OBJECTS_DIR)/CCMenu_mobile.o \
 	$(OBJECTS_DIR)/CCNode_mobile.o \
 	$(OBJECTS_DIR)/CCParticleSystemPoint_mobile.o \
+	$(OBJECTS_DIR)/CCStdC.o \
+	$(OBJECTS_DIR)/CCThread.o \
 	$(OBJECTS_DIR)/CCTransition_mobile.o \
 	$(OBJECTS_DIR)/platform.o \
+	$(OBJECTS_DIR)/CCLock.o \
+	$(OBJECTS_DIR)/CCAccelerometer_wophone.o \
+	$(OBJECTS_DIR)/CCApplication_wophone.o \
+	$(OBJECTS_DIR)/CCEGLView_wophone.o \
+	$(OBJECTS_DIR)/CCFileUtils_wophone.o \
 	$(OBJECTS_DIR)/CCNS_wophone.o \
-	$(OBJECTS_DIR)/ccxApplication_wophone.o \
-	$(OBJECTS_DIR)/CCXEGLView_wophone.o \
-	$(OBJECTS_DIR)/CCXFileUtils_wophone.o \
-	$(OBJECTS_DIR)/CCXUIAccelerometer_wophone.o \
 	$(OBJECTS_DIR)/CCAnimation.o \
 	$(OBJECTS_DIR)/CCAnimationCache.o \
 	$(OBJECTS_DIR)/CCSprite.o \
@@ -97,9 +103,9 @@ OBJECTS = \
 	$(OBJECTS_DIR)/CCSpriteFrameCache.o \
 	$(OBJECTS_DIR)/CCSpriteSheet.o \
 	$(OBJECTS_DIR)/base64.o \
+	$(OBJECTS_DIR)/CCPointExtension.o \
 	$(OBJECTS_DIR)/CCProfiling.o \
 	$(OBJECTS_DIR)/ccUtils.o \
-	$(OBJECTS_DIR)/CGPointExtension.o \
 	$(OBJECTS_DIR)/TransformUtils.o \
 	$(OBJECTS_DIR)/FileUtils.o \
 	$(OBJECTS_DIR)/TGAlib.o \
@@ -186,26 +192,26 @@ $(OBJECTS_DIR)/CCActionTiledGrid.o : ../actions/CCActionTiledGrid.cpp
 $(OBJECTS_DIR)/CCAtlasNode.o : ../base_nodes/CCAtlasNode.cpp
 	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CCAtlasNode.o ../base_nodes/CCAtlasNode.cpp
 
-$(OBJECTS_DIR)/CGAffineTransform.o : ../cocoa/CGAffineTransform.cpp
-	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CGAffineTransform.o ../cocoa/CGAffineTransform.cpp
+$(OBJECTS_DIR)/CCAffineTransform.o : ../cocoa/CCAffineTransform.cpp
+	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CCAffineTransform.o ../cocoa/CCAffineTransform.cpp
 
-$(OBJECTS_DIR)/CGGeometry.o : ../cocoa/CGGeometry.cpp
-	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CGGeometry.o ../cocoa/CGGeometry.cpp
+$(OBJECTS_DIR)/CCAutoreleasePool.o : ../cocoa/CCAutoreleasePool.cpp
+	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CCAutoreleasePool.o ../cocoa/CCAutoreleasePool.cpp
 
-$(OBJECTS_DIR)/NSAutoreleasePool.o : ../cocoa/NSAutoreleasePool.cpp
-	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/NSAutoreleasePool.o ../cocoa/NSAutoreleasePool.cpp
+$(OBJECTS_DIR)/CCData.o : ../cocoa/CCData.cpp
+	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CCData.o ../cocoa/CCData.cpp
 
-$(OBJECTS_DIR)/NSData.o : ../cocoa/NSData.cpp
-	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/NSData.o ../cocoa/NSData.cpp
+$(OBJECTS_DIR)/CCGeometry.o : ../cocoa/CCGeometry.cpp
+	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CCGeometry.o ../cocoa/CCGeometry.cpp
 
-$(OBJECTS_DIR)/NSObject.o : ../cocoa/NSObject.cpp
-	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/NSObject.o ../cocoa/NSObject.cpp
+$(OBJECTS_DIR)/CCObject.o : ../cocoa/CCObject.cpp
+	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CCObject.o ../cocoa/CCObject.cpp
 
-$(OBJECTS_DIR)/NSSet.o : ../cocoa/NSSet.cpp
-	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/NSSet.o ../cocoa/NSSet.cpp
+$(OBJECTS_DIR)/CCSet.o : ../cocoa/CCSet.cpp
+	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CCSet.o ../cocoa/CCSet.cpp
 
-$(OBJECTS_DIR)/NSZone.o : ../cocoa/NSZone.cpp
-	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/NSZone.o ../cocoa/NSZone.cpp
+$(OBJECTS_DIR)/CCZone.o : ../cocoa/CCZone.cpp
+	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CCZone.o ../cocoa/CCZone.cpp
 
 $(OBJECTS_DIR)/CCGrabber.o : ../effects/CCGrabber.cpp
 	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CCGrabber.o ../effects/CCGrabber.cpp
@@ -267,12 +273,21 @@ $(OBJECTS_DIR)/CCParticleSystem.o : ../particle_nodes/CCParticleSystem.cpp
 $(OBJECTS_DIR)/CCParticleSystemQuad.o : ../particle_nodes/CCParticleSystemQuad.cpp
 	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CCParticleSystemQuad.o ../particle_nodes/CCParticleSystemQuad.cpp
 
+$(OBJECTS_DIR)/CCCommon.o : ../platform/CCCommon.cpp
+	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CCCommon.o ../platform/CCCommon.cpp
+
 $(OBJECTS_DIR)/CCDirector_mobile.o : ../platform/CCDirector_mobile.cpp
 	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CCDirector_mobile.o ../platform/CCDirector_mobile.cpp
 
+$(OBJECTS_DIR)/CCGL.o : ../platform/CCGL.cpp
+	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CCGL.o ../platform/CCGL.cpp
+
 $(OBJECTS_DIR)/CCGrid_mobile.o : ../platform/CCGrid_mobile.cpp
 	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CCGrid_mobile.o ../platform/CCGrid_mobile.cpp
 
+$(OBJECTS_DIR)/CCImage.o : ../platform/CCImage.cpp
+	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CCImage.o ../platform/CCImage.cpp
+
 $(OBJECTS_DIR)/CCLayer_mobile.o : ../platform/CCLayer_mobile.cpp
 	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CCLayer_mobile.o ../platform/CCLayer_mobile.cpp
 
@@ -285,26 +300,35 @@ $(OBJECTS_DIR)/CCNode_mobile.o : ../platform/CCNode_mobile.cpp
 $(OBJECTS_DIR)/CCParticleSystemPoint_mobile.o : ../platform/CCParticleSystemPoint_mobile.cpp
 	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CCParticleSystemPoint_mobile.o ../platform/CCParticleSystemPoint_mobile.cpp
 
+$(OBJECTS_DIR)/CCStdC.o : ../platform/CCStdC.cpp
+	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CCStdC.o ../platform/CCStdC.cpp
+
+$(OBJECTS_DIR)/CCThread.o : ../platform/CCThread.cpp
+	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CCThread.o ../platform/CCThread.cpp
+
 $(OBJECTS_DIR)/CCTransition_mobile.o : ../platform/CCTransition_mobile.cpp
 	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CCTransition_mobile.o ../platform/CCTransition_mobile.cpp
 
 $(OBJECTS_DIR)/platform.o : ../platform/platform.cpp
 	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/platform.o ../platform/platform.cpp
 
-$(OBJECTS_DIR)/CCNS_wophone.o : ../platform/wophone/CCNS_wophone.cpp
-	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CCNS_wophone.o ../platform/wophone/CCNS_wophone.cpp
+$(OBJECTS_DIR)/CCLock.o : ../platform/ios/CCLock.cpp
+	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CCLock.o ../platform/ios/CCLock.cpp
+
+$(OBJECTS_DIR)/CCAccelerometer_wophone.o : ../platform/wophone/CCAccelerometer_wophone.cpp
+	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CCAccelerometer_wophone.o ../platform/wophone/CCAccelerometer_wophone.cpp
 
-$(OBJECTS_DIR)/ccxApplication_wophone.o : ../platform/wophone/ccxApplication_wophone.cpp
-	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/ccxApplication_wophone.o ../platform/wophone/ccxApplication_wophone.cpp
+$(OBJECTS_DIR)/CCApplication_wophone.o : ../platform/wophone/CCApplication_wophone.cpp
+	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CCApplication_wophone.o ../platform/wophone/CCApplication_wophone.cpp
 
-$(OBJECTS_DIR)/CCXEGLView_wophone.o : ../platform/wophone/CCXEGLView_wophone.cpp
-	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CCXEGLView_wophone.o ../platform/wophone/CCXEGLView_wophone.cpp
+$(OBJECTS_DIR)/CCEGLView_wophone.o : ../platform/wophone/CCEGLView_wophone.cpp
+	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CCEGLView_wophone.o ../platform/wophone/CCEGLView_wophone.cpp
 
-$(OBJECTS_DIR)/CCXFileUtils_wophone.o : ../platform/wophone/CCXFileUtils_wophone.cpp
-	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CCXFileUtils_wophone.o ../platform/wophone/CCXFileUtils_wophone.cpp
+$(OBJECTS_DIR)/CCFileUtils_wophone.o : ../platform/wophone/CCFileUtils_wophone.cpp
+	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CCFileUtils_wophone.o ../platform/wophone/CCFileUtils_wophone.cpp
 
-$(OBJECTS_DIR)/CCXUIAccelerometer_wophone.o : ../platform/wophone/CCXUIAccelerometer_wophone.cpp
-	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CCXUIAccelerometer_wophone.o ../platform/wophone/CCXUIAccelerometer_wophone.cpp
+$(OBJECTS_DIR)/CCNS_wophone.o : ../platform/wophone/CCNS_wophone.cpp
+	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CCNS_wophone.o ../platform/wophone/CCNS_wophone.cpp
 
 $(OBJECTS_DIR)/CCAnimation.o : ../sprite_nodes/CCAnimation.cpp
 	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CCAnimation.o ../sprite_nodes/CCAnimation.cpp
@@ -330,15 +354,15 @@ $(OBJECTS_DIR)/CCSpriteSheet.o : ../sprite_nodes/CCSpriteSheet.cpp
 $(OBJECTS_DIR)/base64.o : ../support/base64.cpp
 	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/base64.o ../support/base64.cpp
 
+$(OBJECTS_DIR)/CCPointExtension.o : ../support/CCPointExtension.cpp
+	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CCPointExtension.o ../support/CCPointExtension.cpp
+
 $(OBJECTS_DIR)/CCProfiling.o : ../support/CCProfiling.cpp
 	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CCProfiling.o ../support/CCProfiling.cpp
 
 $(OBJECTS_DIR)/ccUtils.o : ../support/ccUtils.cpp
 	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/ccUtils.o ../support/ccUtils.cpp
 
-$(OBJECTS_DIR)/CGPointExtension.o : ../support/CGPointExtension.cpp
-	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CGPointExtension.o ../support/CGPointExtension.cpp
-
 $(OBJECTS_DIR)/TransformUtils.o : ../support/TransformUtils.cpp
 	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/TransformUtils.o ../support/TransformUtils.cpp
 
diff --git a/cocos2dx/proj.wophone/cocos2d-wophone.TMK3 b/cocos2dx/proj.wophone/cocos2d-wophone.TMK3
index 2e500f58668a..dbf45a2830a4 100644
--- a/cocos2dx/proj.wophone/cocos2d-wophone.TMK3
+++ b/cocos2dx/proj.wophone/cocos2d-wophone.TMK3
@@ -29,15 +29,14 @@ INCLUDE_TMK3=$(TO_PROJECT_ROOT)/MakeInclude/TG3_APP_Arm.TMK3
 ;PRE_DEFINE=USE_MTAPI=1			;使用 MTAPI 库，此时生成的 Makefile 会自动连接有关的LIB
 
 ;C、C++预定义宏，可以使用多个DEFINES串，也可以使用DEFINES1、DEFINES2等方式，MakeFile中依据出现顺序(不是数字大小)排列
-DEFINES=-DCCX_UNDER_WOPHONE		;这里填入应用的自定义宏。注意：ITOPS自己的所需定义会自动包含，故此这里仅仅包含应用自己特有的定义即可
+DEFINES=-DCC_UNDER_WOPHONE		;这里填入应用的自定义宏。注意：ITOPS自己的所需定义会自动包含，故此这里仅仅包含应用自己特有的定义即可
 DEFINES=-D__TG3_PURE_DLL__		;生成的是纯动态库（意思是：不是TOPS应用，但可以是TCOM组件）
 DEFINES=-DUSE_FILE32API				;读取 zip 文件需要此宏
 ;DEFINES=-D__TCOM_SUPPORT__		;生成的是TCOM组件（注意：TOPS应用也可以同时是TCOM组件）
 
 ;包含路径，可以使用多个INCLUDE_PATH串，也可以使用INCLUDE_PATH1、INCLUDE_PATH2等方式，MakeFile中依据出现顺序(不是数字大小)排列
 ;应用额外的包含路径。注意：ITOPS自己的所有路径都会自动包含，故此这里仅仅包含应用自己特有的路径即可
-INCLUDE_PATH=-I../ -I../include 
-INCLUDE_PATH=-I../../platform_support/include
+INCLUDE_PATH=-I../ -I../include  -I../platform
 INCLUDE_PATH=-I$(TO_PROJECT_ROOT)/Include/ThirdParty/libxml2
 INCLUDE_PATH=-I$(TO_PROJECT_ROOT)/Include/ThirdParty/iconv
 INCLUDE_PATH=-I$(TO_PROJECT_ROOT)/Include/ThirdParty/libpng
@@ -61,6 +60,8 @@ INCLUDEFILE=
 ;可以使用多个EXCLUDEFILE串，也可以使用EXCLUDEFILE1、EXCLUDEFILE2等方式，MakeFile中依据出现顺序(不是数字大小)排列
 EXCLUDEFILE= ./textures/CCPVRTexture.cpp 
 EXCLUDEFILE= ./platform/wophone/NewDeleteOp.cpp
+EXCLUDEFILE= ./platform/wophone/CCImage_wophone.cpp
+EXCLUDEFILE= ./platform/wophone/CCThread_wophone.cpp
 EXCLUDEFILE= ./platform/win32/
 EXCLUDEFILE= ./platform/android/
 EXCLUDEFILE= ./platform/iphone/
diff --git a/tests/test.wophone/Makefile.ARM b/tests/test.wophone/Makefile.ARM
index 368689326c8a..fa3ddb784118 100644
--- a/tests/test.wophone/Makefile.ARM
+++ b/tests/test.wophone/Makefile.ARM
@@ -12,17 +12,18 @@ OUTPUT_FILENAME = libTestWophone.so
 include $(TO_PROJECT_ROOT)/MakeInclude/Makefile_Base_DynamicLib.ARM
 include $(TO_PROJECT_ROOT)/MakeInclude/Makefile_TOPS_Def.ARM
 
-DEFINES += -DCCX_UNDER_WOPHONE
+DEFINES += -DCC_UNDER_WOPHONE
 INCLUDE_PATH += -I../ -I../Res \
                 -I../../cocos2dx \
                 -I../../cocos2dx/include \
+                -I../../cocos2dx/platform \
                 -I../../platform_support/include \
                 -I../../chipmunk/include/chipmunk \
                 -I../../CocosDenshion/include \
                 -I../../ \
                 -I../tests
 
-LIBS += -lCocos2dStatic -lPlatformSupportStatic	-lCocosDenshionStatic -lTSoundPlayer -lChipmunkStatic -lBox2dStatic -lTG3_GLESv1_CM -lTG3_EGL -lz -lxml2 -lpng14 -lImageToolKit -ljpeg
+LIBS += -lCocos2dStatic -lCocosDenshionStatic -lTSoundPlayer -lChipmunkStatic -lBox2dStatic -lTG3_GLESv1_CM -lTG3_EGL -lz -lxml2 -lpng14 -lImageToolKit -ljpeg
 
 OBJECTS_DIR = ./Debug-ARM
 DESTDIR = $(TO_PROJECT_ROOT)/$(BIN_OUTPUT_DIR)
diff --git a/tests/test.wophone/test_wophone_Arm.TMK3 b/tests/test.wophone/test_wophone_Arm.TMK3
index 75821018434b..c087ea1b30c0 100644
--- a/tests/test.wophone/test_wophone_Arm.TMK3
+++ b/tests/test.wophone/test_wophone_Arm.TMK3
@@ -29,7 +29,7 @@ INCLUDE_TMK3=$(TO_PROJECT_ROOT)/MakeInclude/TG3_APP_Arm.TMK3		;TOPS
 ;PRE_DEFINE=USE_MTAPI=1			;使用 MTAPI 库，此时生成的 Makefile 会自动连接有关的LIB
 
 ;C、C++预定义宏，可以使用多个DEFINES串，也可以使用DEFINES1、DEFINES2等方式，MakeFile中依据出现顺序(不是数字大小)排列
-DEFINES=-DCCX_UNDER_WOPHONE		;这里填入应用的自定义宏。注意：ITOPS自己的所需定义会自动包含，故此这里仅仅包含应用自己特有的定义即可
+DEFINES=-DCC_UNDER_WOPHONE		;这里填入应用的自定义宏。注意：ITOPS自己的所需定义会自动包含，故此这里仅仅包含应用自己特有的定义即可
 ;DEFINES=-D__TG3_PURE_DLL__		;生成的是纯动态库（意思是：不是TOPS应用，但可以是TCOM组件）
 ;DEFINES=-D__TCOM_SUPPORT__		;生成的是TCOM组件（注意：TOPS应用也可以同时是TCOM组件）
 
@@ -37,8 +37,10 @@ DEFINES=-DCCX_UNDER_WOPHONE		;
 INCLUDE_PATH =-I../ -I../Res \
 INCLUDE_PATH=-I../../cocos2dx \
 INCLUDE_PATH=-I../../cocos2dx/include \
+INCLUDE_PATH=-I../../cocos2dx/platform \
 INCLUDE_PATH=-I../../platform_support/include \
 INCLUDE_PATH=-I../../chipmunk/include/chipmunk \
+INCLUDE_PATH=-I../../CocosDenshion/include \
 INCLUDE_PATH=-I../../ \
 INCLUDE_PATH=-I../tests
 
@@ -60,5 +62,5 @@ INCLUDEFILE=
 ;可以使用多个EXCLUDEFILE串，也可以使用EXCLUDEFILE1、EXCLUDEFILE2等方式，MakeFile中依据出现顺序(不是数字大小)排列
 EXCLUDEFILE=./framework.win32
 EXCLUDEFILE=./test.android
-EXCLUDEFILE=./test.iphone
-EXCLUDEFILE=./proj.win32
\ No newline at end of file
+EXCLUDEFILE=./test.ios
+EXCLUDEFILE=./test.win32
\ No newline at end of file