cocos2d · Mar 10, 2011 · Mar 9, 2011
diff --git a/Box2D/proj.uphone/Box2D.TMK3 → Box2D/proj.wophone/Box2D.TMK3 b/Box2D/proj.uphone/Box2D.TMK3 → 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_UPHONE		;��������Ӧ�õ��Զ���ꡣע�⣺ITOPS�Լ������趨����Զ��������ʴ������������Ӧ���Լ����еĶ��弴��
+DEFINES=-DCCX_UNDER_WOPHONE		;��������Ӧ�õ��Զ���ꡣע�⣺ITOPS�Լ������趨����Զ��������ʴ������������Ӧ���Լ����еĶ��弴��
 ;DEFINES=-D__TG3_PURE_DLL__		;���ɵ��Ǵ���̬�⣨��˼�ǣ�����TOPSӦ�ã���������TCOM�����
 ;DEFINES=-D__TCOM_SUPPORT__		;���ɵ���TCOM�����ע�⣺TOPSӦ��Ҳ����ͬʱ��TCOM�����
 

diff --git a/Box2D/proj.uphone/Box2D.uphone.vcproj → Box2D/proj.wophone/Box2D.wophone.vcproj b/Box2D/proj.uphone/Box2D.uphone.vcproj → Box2D/proj.wophone/Box2D.wophone.vcproj
diff --git a/Box2D/proj.uphone/Makefile-dynamic.ARM → Box2D/proj.wophone/Makefile-dynamic.ARM b/Box2D/proj.uphone/Makefile-dynamic.ARM → Box2D/proj.wophone/Makefile-dynamic.ARM
@@ -12,7 +12,7 @@ OUTPUT_FILENAME = libbox2d.so
 include $(TO_PROJECT_ROOT)/MakeInclude/Makefile_Base_DynamicLib.ARM
 include $(TO_PROJECT_ROOT)/MakeInclude/Makefile_TOPS_Def.ARM
 
-DEFINES += -DCCX_UNDER_UPHONE
+DEFINES += -DCCX_UNDER_WOPHONE
 INCLUDE_PATH += -I../ -I../../
 
 CXX_FLAGS += -fvisibility=default

diff --git a/Box2D/proj.uphone/Makefile.ARM → Box2D/proj.wophone/Makefile.ARM b/Box2D/proj.uphone/Makefile.ARM → 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_UPHONE
+DEFINES += -DCCX_UNDER_WOPHONE
 INCLUDE_PATH += -I../ -I../../
 
 CXX_FLAGS += -fvisibility=default

diff --git a/CHANGELOG b/CHANGELOG
@@ -11,17 +11,17 @@ cocos2d-0.99.5-x-0.7.2 @ Jan.26,2011
     - add CocosDenshion::SimpleAudioEngine implement on android
     - the engine can adjust the apk filename automatically
     - the engine will not crash at surface recreate, especially at background-to-foreground switching
- [uphone]
+ [wophone]
     - switch the game to background, then press power key will not cause the background music play again
-    - remove the methods of using resouce map in cocos2d-uphone & SimpleAudioEngine. 
+    - remove the methods of using resouce map in cocos2d-wophone & SimpleAudioEngine. 
       Only zip resource is recommended and suppported.
     - can auto find the installed path of your game, and load zip resource file from the current folder. 
       No absolute path in code any more. Do this to support installing games to micro-SD card
 
 
 cocos2d-0.99.4-x-0.7.1 @ Dec.20,2010
  [all platforms]
-    - add CCKeypadDelegate class, which enable CCLayer to respond "back" key in uphone & android
+    - add CCKeypadDelegate class, which enable CCLayer to respond "back" key in wophone & android
     - Add namespace for CocosDenshion
     - fix compile errors when enable CC_XXX_DEBUG_DRAW switchs in ccConfig.h
     - fix memory leaks on each platform
@@ -36,7 +36,7 @@ cocos2d-0.99.4-x-0.7.1 @ Dec.20,2010
     - Add support of loading textureImageData from the ParticleDesign plist file
     - Fix more then 3000 complie warnings
     - You can try to use this version to develop your iOS game now. It's much more stable than the previous version
- [uphone]  
+ [wophone]  
     - Games can easily read resources from zip file now. This will drastically reduce the memory usage
     - Add power management: pause the message loop when cocos2d-x game is switched to background or backlight down
     - Multi-touch support
@@ -47,12 +47,12 @@ cocos2d-0.99.4-x-0.7.1 @ Dec.20,2010
 cocos2d-0.99.4-x-0.7.0 @ Nov.29,2010
 * cocos2d-iphone-cpp port ready! include accelerometer & multi-touch
 * refactor the directory structure of HelloWorld & tests
-* cocos2d-uphone supports accelerometer
-* add cocos2d-x wizard for cocos2d-win32 & cocos2d-uphone for VisualStudio2008
-* jump out a message box when load texture failed (win32 & uphone)
+* cocos2d-wophone supports accelerometer
+* add cocos2d-x wizard for cocos2d-win32 & cocos2d-wophone for VisualStudio2008
+* jump out a message box when load texture failed (win32 & wophone)
 * more details: 	http://www.cocos2d-x.org/versions/show/4
 
-cocos2d-0.99.4-uphone-win32-stable-rc1
+cocos2d-0.99.4-wophone-win32-stable-rc1
 	http://www.cocos2d-x.org/versions/show/1
 	http://www.cocos2d-x.org/versions/show/2
 	http://www.cocos2d-x.org/versions/show/3

diff --git a/...n/proj.uphone/CocosDenshion.uphone.vcproj → ...proj.wophone/CocosDenshion.wophone.vcproj b/...n/proj.uphone/CocosDenshion.uphone.vcproj → ...proj.wophone/CocosDenshion.wophone.vcproj
@@ -181,54 +181,54 @@
 			Name="source"
 			>
 			<File
-				RelativePath="..\uphone\FileUtils.cpp"
+				RelativePath="..\wophone\FileUtils.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\uphone\FileUtils.h"
+				RelativePath="..\wophone\FileUtils.h"
 				>
 			</File>
 			<File
-				RelativePath="..\uphone\SimpleAudioEngine.cpp"
+				RelativePath="..\wophone\SimpleAudioEngine.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\uphone\SoundDataManager.cpp"
+				RelativePath="..\wophone\SoundDataManager.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\uphone\SoundDataManager.h"
+				RelativePath="..\wophone\SoundDataManager.h"
 				>
 			</File>
 			<File
-				RelativePath="..\uphone\SoundPlayer.cpp"
+				RelativePath="..\wophone\SoundPlayer.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\uphone\SoundPlayer.h"
+				RelativePath="..\wophone\SoundPlayer.h"
 				>
 			</File>
 			<File
-				RelativePath="..\uphone\uthash.h"
+				RelativePath="..\wophone\uthash.h"
 				>
 			</File>
 			<Filter
 				Name="zip_support"
 				>
 				<File
-					RelativePath="..\uphone\zip_support\ioapi.cpp"
+					RelativePath="..\wophone\zip_support\ioapi.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\uphone\zip_support\ioapi.h"
+					RelativePath="..\wophone\zip_support\ioapi.h"
 					>
 				</File>
 				<File
-					RelativePath="..\uphone\zip_support\unzip.cpp"
+					RelativePath="..\wophone\zip_support\unzip.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\uphone\zip_support\unzip.h"
+					RelativePath="..\wophone\zip_support\unzip.h"
 					>
 				</File>
 			</Filter>

diff --git a/...Denshion/proj.uphone/Makefile-dynamic.ARM → ...enshion/proj.wophone/Makefile-dynamic.ARM b/...Denshion/proj.uphone/Makefile-dynamic.ARM → ...enshion/proj.wophone/Makefile-dynamic.ARM
@@ -1,7 +1,7 @@
 
 ############################################################################
 #
-#   Makefile for building : SimpleAudioEngine_Arm_uphone.TMK3
+#   Makefile for building : SimpleAudioEngine_Arm_wophone.TMK3
 #   Created by TMK3_V2.3, please do not modify.
 #
 #############################################################################
@@ -12,7 +12,7 @@ OUTPUT_FILENAME = libCocosDenshion.so
 include $(TO_PROJECT_ROOT)/MakeInclude/Makefile_Base_DynamicLib.ARM
 include $(TO_PROJECT_ROOT)/MakeInclude/Makefile_TOPS_Def.ARM
 
-DEFINES += -DCCX_UNDER_UPHONE \
+DEFINES += -DCCX_UNDER_WOPHONE \
           -D__TG3_PURE_DLL__ \
           -DUSE_FILE32API
 INCLUDE_PATH += -I../ \
@@ -56,24 +56,24 @@ clean :
 	-$(DEL_FILE) $(OBJECTS)
 	-$(DEL_FILE) $(TARGET)
 
-$(OBJECTS_DIR)/FileUtils.o : ../uphone/FileUtils.cpp
-	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/FileUtils.o ../uphone/FileUtils.cpp
+$(OBJECTS_DIR)/FileUtils.o : ../wophone/FileUtils.cpp
+	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/FileUtils.o ../wophone/FileUtils.cpp
 
-$(OBJECTS_DIR)/ResourceHandle.o : ../uphone/ResourceHandle.cpp
-	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/ResourceHandle.o ../uphone/ResourceHandle.cpp
+$(OBJECTS_DIR)/ResourceHandle.o : ../wophone/ResourceHandle.cpp
+	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/ResourceHandle.o ../wophone/ResourceHandle.cpp
 
-$(OBJECTS_DIR)/SimpleAudioEngine.o : ../uphone/SimpleAudioEngine.cpp
-	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/SimpleAudioEngine.o ../uphone/SimpleAudioEngine.cpp
+$(OBJECTS_DIR)/SimpleAudioEngine.o : ../wophone/SimpleAudioEngine.cpp
+	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/SimpleAudioEngine.o ../wophone/SimpleAudioEngine.cpp
 
-$(OBJECTS_DIR)/SoundDataManager.o : ../uphone/SoundDataManager.cpp
-	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/SoundDataManager.o ../uphone/SoundDataManager.cpp
+$(OBJECTS_DIR)/SoundDataManager.o : ../wophone/SoundDataManager.cpp
+	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/SoundDataManager.o ../wophone/SoundDataManager.cpp
 
-$(OBJECTS_DIR)/SoundPlayer.o : ../uphone/SoundPlayer.cpp
-	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/SoundPlayer.o ../uphone/SoundPlayer.cpp
+$(OBJECTS_DIR)/SoundPlayer.o : ../wophone/SoundPlayer.cpp
+	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/SoundPlayer.o ../wophone/SoundPlayer.cpp
 
-$(OBJECTS_DIR)/ioapi.o : ../uphone/zip_support/ioapi.c
-	$(CC) -c $(CC_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/ioapi.o ../uphone/zip_support/ioapi.c
+$(OBJECTS_DIR)/ioapi.o : ../wophone/zip_support/ioapi.c
+	$(CC) -c $(CC_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/ioapi.o ../wophone/zip_support/ioapi.c
 
-$(OBJECTS_DIR)/unzip.o : ../uphone/zip_support/unzip.c
-	$(CC) -c $(CC_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/unzip.o ../uphone/zip_support/unzip.c
+$(OBJECTS_DIR)/unzip.o : ../wophone/zip_support/unzip.c
+	$(CC) -c $(CC_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/unzip.o ../wophone/zip_support/unzip.c
 
diff --git a/CocosDenshion/proj.uphone/Makefile.ARM → CocosDenshion/proj.wophone/Makefile.ARM b/CocosDenshion/proj.uphone/Makefile.ARM → CocosDenshion/proj.wophone/Makefile.ARM
@@ -1,7 +1,7 @@
 
 ############################################################################
 #
-#   Makefile for building : SimpleAudioEngine_Arm_uphone.TMK3
+#   Makefile for building : SimpleAudioEngine_Arm_wophone.TMK3
 #   Created by TMK3_V2.3, please do not modify.
 #
 #############################################################################
@@ -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_UPHONE \
+DEFINES += -DCCX_UNDER_WOPHONE \
           -D__TG3_PURE_DLL__ \
           -DUSE_FILE32API
 INCLUDE_PATH += -I../ \
@@ -52,20 +52,20 @@ clean :
 	-$(DEL_FILE) $(OBJECTS)
 	-$(DEL_FILE) $(TARGET)
 
-$(OBJECTS_DIR)/FileUtils.o : ../uphone/FileUtils.cpp
-	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/FileUtils.o ../uphone/FileUtils.cpp
+$(OBJECTS_DIR)/FileUtils.o : ../wophone/FileUtils.cpp
+	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/FileUtils.o ../wophone/FileUtils.cpp
 
-$(OBJECTS_DIR)/SimpleAudioEngine.o : ../uphone/SimpleAudioEngine.cpp
-	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/SimpleAudioEngine.o ../uphone/SimpleAudioEngine.cpp
+$(OBJECTS_DIR)/SimpleAudioEngine.o : ../wophone/SimpleAudioEngine.cpp
+	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/SimpleAudioEngine.o ../wophone/SimpleAudioEngine.cpp
 
-$(OBJECTS_DIR)/SoundDataManager.o : ../uphone/SoundDataManager.cpp
-	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/SoundDataManager.o ../uphone/SoundDataManager.cpp
+$(OBJECTS_DIR)/SoundDataManager.o : ../wophone/SoundDataManager.cpp
+	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/SoundDataManager.o ../wophone/SoundDataManager.cpp
 
-$(OBJECTS_DIR)/SoundPlayer.o : ../uphone/SoundPlayer.cpp
-	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/SoundPlayer.o ../uphone/SoundPlayer.cpp
+$(OBJECTS_DIR)/SoundPlayer.o : ../wophone/SoundPlayer.cpp
+	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/SoundPlayer.o ../wophone/SoundPlayer.cpp
 
-$(OBJECTS_DIR)/ioapi.o : ../uphone/zip_support/ioapi.cpp
-	$(CC) -c $(CC_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/ioapi.o ../uphone/zip_support/ioapi.cpp
+$(OBJECTS_DIR)/ioapi.o : ../wophone/zip_support/ioapi.cpp
+	$(CC) -c $(CC_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/ioapi.o ../wophone/zip_support/ioapi.cpp
 
-$(OBJECTS_DIR)/unzip.o : ../uphone/zip_support/unzip.cpp
-	$(CC) -c $(CC_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/unzip.o ../uphone/zip_support/unzip.cpp
+$(OBJECTS_DIR)/unzip.o : ../wophone/zip_support/unzip.cpp
+	$(CC) -c $(CC_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/unzip.o ../wophone/zip_support/unzip.cpp
diff --git a/....uphone/SimpleAudioEngine_Arm_uphone.TMK3 → ...ophone/SimpleAudioEngine_Arm_wophone.TMK3 b/....uphone/SimpleAudioEngine_Arm_uphone.TMK3 → ...ophone/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_UPHONE				;��uphone�����µ�makefile
+DEFINES=-DCCX_UNDER_WOPHONE				;��wophone�����µ�makefile
 DEFINES=-D__TG3_PURE_DLL__		;���ɵ��Ǵ���̬�⣨��˼�ǣ�����TOPSӦ�ã���������TCOM�����
 DEFINES=-DUSE_FILE32API
 

diff --git a/CocosDenshion/win32/MciPlayer.h b/CocosDenshion/win32/MciPlayer.h
@@ -1,5 +1,5 @@
-#ifndef _MCI_PLAYER_UPHONE_H_
-#define _MCI_PLAYER_UPHONE_H_
+#ifndef _MCI_PLAYER_WIN32_H_
+#define _MCI_PLAYER_WIN32_H_
 
 #include<windows.h>
 #include <mmsystem.h>

diff --git a/CocosDenshion/uphone/FileUtils.cpp → CocosDenshion/wophone/FileUtils.cpp b/CocosDenshion/uphone/FileUtils.cpp → CocosDenshion/wophone/FileUtils.cpp
diff --git a/CocosDenshion/uphone/FileUtils.h → CocosDenshion/wophone/FileUtils.h b/CocosDenshion/uphone/FileUtils.h → CocosDenshion/wophone/FileUtils.h
diff --git a/CocosDenshion/uphone/SimpleAudioEngine.cpp → CocosDenshion/wophone/SimpleAudioEngine.cpp b/CocosDenshion/uphone/SimpleAudioEngine.cpp → CocosDenshion/wophone/SimpleAudioEngine.cpp
diff --git a/CocosDenshion/uphone/SoundDataManager.cpp → CocosDenshion/wophone/SoundDataManager.cpp b/CocosDenshion/uphone/SoundDataManager.cpp → CocosDenshion/wophone/SoundDataManager.cpp
diff --git a/CocosDenshion/uphone/SoundDataManager.h → CocosDenshion/wophone/SoundDataManager.h b/CocosDenshion/uphone/SoundDataManager.h → CocosDenshion/wophone/SoundDataManager.h
diff --git a/CocosDenshion/uphone/SoundPlayer.cpp → CocosDenshion/wophone/SoundPlayer.cpp b/CocosDenshion/uphone/SoundPlayer.cpp → CocosDenshion/wophone/SoundPlayer.cpp
diff --git a/CocosDenshion/uphone/SoundPlayer.h → CocosDenshion/wophone/SoundPlayer.h b/CocosDenshion/uphone/SoundPlayer.h → CocosDenshion/wophone/SoundPlayer.h
@@ -1,5 +1,5 @@
-#ifndef _SOUNDPLAYER_UPHONE_H_
-#define _SOUNDPLAYER_UPHONE_H_
+#ifndef _SOUNDPLAYER_WOPHONE_H_
+#define _SOUNDPLAYER_WOPHONE_H_
 
 #include "TG3.h"
 #include "TCOM_MediaPlayer_Method.h"

diff --git a/CocosDenshion/uphone/uthash.h → CocosDenshion/wophone/uthash.h b/CocosDenshion/uphone/uthash.h → CocosDenshion/wophone/uthash.h
diff --git a/CocosDenshion/uphone/zip_support/ioapi.cpp → CocosDenshion/wophone/zip_support/ioapi.cpp b/CocosDenshion/uphone/zip_support/ioapi.cpp → CocosDenshion/wophone/zip_support/ioapi.cpp
diff --git a/CocosDenshion/uphone/zip_support/ioapi.h → CocosDenshion/wophone/zip_support/ioapi.h b/CocosDenshion/uphone/zip_support/ioapi.h → CocosDenshion/wophone/zip_support/ioapi.h
diff --git a/CocosDenshion/uphone/zip_support/unzip.cpp → CocosDenshion/wophone/zip_support/unzip.cpp b/CocosDenshion/uphone/zip_support/unzip.cpp → CocosDenshion/wophone/zip_support/unzip.cpp
diff --git a/CocosDenshion/uphone/zip_support/unzip.h → CocosDenshion/wophone/zip_support/unzip.h b/CocosDenshion/uphone/zip_support/unzip.h → CocosDenshion/wophone/zip_support/unzip.h
diff --git a/HelloWorld/AppDelegate.cpp b/HelloWorld/AppDelegate.cpp
@@ -33,19 +33,19 @@ bool AppDelegate::initInstance()
         // OpenGLView initialized in testsAppDelegate.mm on ios platform, nothing need to do here.
 #endif  // CC_PLATFORM_IOS
 
-#if (CC_TARGET_PLATFORM == CC_PLATFORM_UPHONE)
+#if (CC_TARGET_PLATFORM == CC_PLATFORM_WOPHONE)
 
         // Initialize OpenGLView instance, that release by CCDirector when application terminate.
         // The HelloWorld is designed as HVGA.
         CCEGLView* pMainWnd = new CCEGLView(this);
         CC_BREAK_IF(! pMainWnd || ! pMainWnd->Create(320,480));
 
 #ifndef _TRANZDA_VM_  
-        // on uphone emulator, we copy resources files to Work7/TG3/APP/ folder instead of zip file
+        // on wophone emulator, we copy resources files to Work7/TG3/APP/ folder instead of zip file
         cocos2d::CCFileUtils::setResource("HelloWorld.zip");
 #endif
 
-#endif  // CC_PLATFORM_UPHONE
+#endif  // CC_PLATFORM_WOPHONE
 
         bRet = true;
     } while (0);

diff --git a/HelloWorld/uphone/HelloWorld.TMK3 → HelloWorld/wophone/HelloWorld.TMK3 b/HelloWorld/uphone/HelloWorld.TMK3 → HelloWorld/wophone/HelloWorld.TMK3
@@ -29,12 +29,12 @@ 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_UPHONE		;��������Ӧ�õ��Զ���ꡣע�⣺ITOPS�Լ������趨����Զ��������ʴ������������Ӧ���Լ����еĶ��弴��
+DEFINES=-DCCX_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../uphone -I../cocos2dx -I../cocos2dx/include -I../platform_support/include		;Ӧ�ö���İ���·����ע�⣺ITOPS�Լ�������·�������Զ��������ʴ������������Ӧ���Լ����е�·������
+INCLUDE_PATH=-I./Res -I../ -I../wophone -I../cocos2dx -I../cocos2dx/include -I../platform_support/include		;Ӧ�ö���İ���·����ע�⣺ITOPS�Լ�������·�������Զ��������ʴ������������Ӧ���Լ����е�·������
 
 ;���ӵĿ��ļ�������ʹ�ö��LIBS����Ҳ����ʹ��LIBS1��LIBS2�ȷ�ʽ��MakeFile�����ݳ���˳��(�������ִ�С)����
 LIBS=-lCocos2dStatic -lPlatformSupportStatic -lTG3_GLESv1_CM -lTG3_EGL -lz -lxml2 -lpng14 -lImageToolKit -ljpeg		;Ӧ�ö�������ӿ⡣ע�⣺ITOPS�Լ���������Զ����������ҿ����·��Ҳ�Ѿ��������ʴ������������Ӧ���Լ����еĿ�����ּ���
@@ -53,4 +53,4 @@ INCLUDEFILE=
 EXCLUDEFILE=./android
 EXCLUDEFILE=./iphone
 EXCLUDEFILE=./win32
-EXCLUDEFILE=./uphone/NewDeleteOp.cpp
+EXCLUDEFILE=./wophone/NewDeleteOp.cpp
diff --git a/HelloWorld/uphone/HelloWorld.uphone.vcproj → HelloWorld/wophone/HelloWorld.wophone.vcproj b/HelloWorld/uphone/HelloWorld.uphone.vcproj → HelloWorld/wophone/HelloWorld.wophone.vcproj
@@ -41,7 +41,7 @@
 			<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;..\..\cocos2dx\include;..\..\cocos2dx;..\..\..\PRJ_TG3\Include\OpenGL;..\uphone;..\;.\Res;..\..\cocos2dx\platform"
+				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;..\..\cocos2dx\include;..\..\cocos2dx;..\..\..\PRJ_TG3\Include\OpenGL;..\wophone;..\;.\Res;..\..\cocos2dx\platform"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_TRANZDA_VM_;SS_MAKEDLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"

diff --git a/...orld/uphone/HelloWorld.uphone.vcproj.user → ...ld/wophone/HelloWorld.wophone.vcproj.user b/...orld/uphone/HelloWorld.uphone.vcproj.user → ...ld/wophone/HelloWorld.wophone.vcproj.user
diff --git a/HelloWorld/uphone/HelloWorldUnicodeScript.h → HelloWorld/wophone/HelloWorldUnicodeScript.h b/HelloWorld/uphone/HelloWorldUnicodeScript.h → HelloWorld/wophone/HelloWorldUnicodeScript.h
diff --git a/...orld/uphone/HelloWorldUnicodeScript_str.h → ...rld/wophone/HelloWorldUnicodeScript_str.h b/...orld/uphone/HelloWorldUnicodeScript_str.h → ...rld/wophone/HelloWorldUnicodeScript_str.h
diff --git a/HelloWorld/uphone/Makefile.ARM → HelloWorld/wophone/Makefile.ARM b/HelloWorld/uphone/Makefile.ARM → HelloWorld/wophone/Makefile.ARM
@@ -12,10 +12,10 @@ 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_UPHONE
+DEFINES += -DCCX_UNDER_WOPHONE
 INCLUDE_PATH += -I./Res  \
 								-I../    \
-								-I../uphone \
+								-I../wophone \
                 -I../../cocos2dx \
                 -I../../cocos2dx/include \
                 -I../../platform_support/include

diff --git a/HelloWorld/uphone/NewDeleteOp.cpp → HelloWorld/wophone/NewDeleteOp.cpp b/HelloWorld/uphone/NewDeleteOp.cpp → HelloWorld/wophone/NewDeleteOp.cpp
diff --git a/HelloWorld/uphone/TG3AppDllEntry.cpp → HelloWorld/wophone/TG3AppDllEntry.cpp b/HelloWorld/uphone/TG3AppDllEntry.cpp → HelloWorld/wophone/TG3AppDllEntry.cpp
diff --git a/HelloWorld/uphone/TG3AppDllEntry.h → HelloWorld/wophone/TG3AppDllEntry.h b/HelloWorld/uphone/TG3AppDllEntry.h → HelloWorld/wophone/TG3AppDllEntry.h
diff --git a/HelloWorld/uphone/main.cpp → HelloWorld/wophone/main.cpp b/HelloWorld/uphone/main.cpp → HelloWorld/wophone/main.cpp
@@ -3,7 +3,7 @@
 // Original file name: cocosTemplateEntry.cpp
 // Generated by TOPS Builder:Project wizard,Date:2010-09-27
 
-// uphone header
+// wophone header
 #include "TG3.h"
 
 // game

diff --git a/HelloWorld/uphone/pak/HelloWorld.TG3_IProc → HelloWorld/wophone/pak/HelloWorld.TG3_IProc b/HelloWorld/uphone/pak/HelloWorld.TG3_IProc → HelloWorld/wophone/pak/HelloWorld.TG3_IProc
diff --git a/README.mdown b/README.mdown
@@ -2,13 +2,13 @@ cocos2d-x multiplatform
 ==================
 
 [cocos2d-x][1] is a multi-platform 2D game engine in C++, based on [cocos2d-iphone][2] and licensed under MIT.
-Now this engine has been ported to UPhone, iOS 4.1, Android 2.1 and higher, WindowsXP & Windows7. 
+Now this engine has been ported to WOPhone, iOS 4.1, Android 2.1 and higher, WindowsXP & Windows7. 
 
 Multi Platform
 -------------
    * [cocos2d-iphone-cpp][3]:  tested on iPhone 3.2, 4.1 & 4.2 SDK
    * [cocos2d-android-ndk][4]: based on ndk-r4(crystax.net version) & ndk-r5, tested on Android 2.1, 2.2, 2.3 emulator, HTC G2, G3, G6, G7 device
-   * [cocos2d-uphone][5]: well tested on UPhone of ChinaUnicom, both emulator & device.
+   * [cocos2d-wophone][5]: well tested on WOPhone of ChinaUnicom, both emulator & device.
    * [cocos2d-win32][6]: well tested on WindowsXP & Windows7. It depends on PowerVR OpenGL ES 1.1 libraries for win32 system
 
 
@@ -28,7 +28,7 @@ Contact us
 [2]: http://www.cocos2d-iphone.org "cocos2d for iPhone"
 [3]: http://www.cocos2d-x.org/wiki/cocos2d-x/Cocos2d-iphone-cpp "cocos2d-iphone-cpp"
 [4]: http://www.cocos2d-x.org/wiki/cocos2d-x/Cocos2d-android-ndk "cocos2d-android-ndk"
-[5]: http://www.cocos2d-x.org/wiki/cocos2d-x/Cocos2d-uphone "cocos2d-uphone"
+[5]: http://www.cocos2d-x.org/wiki/cocos2d-x/Cocos2d-wophone "cocos2d-wophone"
 [6]: http://www.cocos2d-x.org/wiki/cocos2d-x/Cocos2d-win32 "cocos2d-win32"
 [7]: http://www.cocos2dx.org "www.cocos2d-x.org"
 [8]: http://www.cocos2d-x.org/embedded/cocos2d-x/classes.html "API References"