Move platform_support into cocos2dx/platform

HelloWorld/android/jni/helloworld/Android.mk

@@ -7,9 +7,9 @@ LOCAL_SRC_FILES := main.cpp \
 ../../../HelloWorldScene.cpp
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../../cocos2dx \
+                    $(LOCAL_PATH)/../../../../cocos2dx/platform \
                     $(LOCAL_PATH)/../../../../cocos2dx/include \
-                    $(LOCAL_PATH)/../../.. \
-                    $(LOCAL_PATH)/../../../../platform_support/include
+                    $(LOCAL_PATH)/../../.. 
 
 LOCAL_LDLIBS := -L$(LOCAL_PATH)/../../libs/armeabi -lcocos2d -llog
 

HelloWorld/uphone/HelloWorld.uphone.vcproj

@@ -4,6 +4,7 @@
 	Version="9.00"
 	Name="HelloWorld"
 	ProjectGUID="{74589012-5241-4918-997A-C0105ABD4DEC}"
+	RootNamespace="HelloWorld"
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
@@ -40,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;..\..\platform_support\include"
+				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"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_TRANZDA_VM_;SS_MAKEDLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -63,7 +64,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="WS2_32.Lib EosConfig.lib SoftSupport.lib TG3_DLL.lib libcocos2d.lib libPlatformSupport.lib"
+				AdditionalDependencies="WS2_32.Lib EosConfig.lib SoftSupport.lib TG3_DLL.lib libcocos2d.lib"
 				OutputFile="$(OutDir)/HelloWorld.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="../../../PRJ_TG3/Common/ICU/lib;../../../PRJ_TG3/Mtapi/Win32/lib;../../../PRJ_TG3/LIB/Win32Lib;../../../PRJ_TG3/Common/SoftSupport"

HelloWorld/win32/HelloWorld.win32.vcproj

@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)platform_support\include&quot;;&quot;$(SolutionDir)cocos2dx\include&quot;;&quot;$(SolutionDir)cocos2dx&quot;;&quot;$(SolutionDir)platform_support\third_party\win32\OGLES&quot;;..\;.\"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)cocos2dx\platform&quot;;&quot;$(SolutionDir)cocos2dx\include&quot;;&quot;$(SolutionDir)cocos2dx&quot;;&quot;$(SolutionDir)cocos2dx\platform\third_party\win32\OGLES&quot;;..\;.\"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"

cocos2d-uphone.sln

@@ -6,9 +6,6 @@ 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}"
-	ProjectSection(ProjectDependencies) = postProject
-		{560E20BA-9562-4AFC-A222-6B7B1956D607} = {560E20BA-9562-4AFC-A222-6B7B1956D607}
-	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CocosDenshion", "CocosDenshion\proj.uphone\CocosDenshion.uphone.vcproj", "{AB17438B-7848-4FD6-AF6E-A6A91F82C6F0}"
 EndProject
@@ -25,8 +22,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tests", "tests\test.uphone\
 		{BA00DDF7-0F25-4C1E-B012-FA230C1F6463} = {BA00DDF7-0F25-4C1E-B012-FA230C1F6463}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PlatformSupport", "platform_support\proj.uphone\PlatformSupport.uphone.vcproj", "{560E20BA-9562-4AFC-A222-6B7B1956D607}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -57,10 +52,6 @@ Global
 		{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
-		{560E20BA-9562-4AFC-A222-6B7B1956D607}.Debug|Win32.ActiveCfg = Debug|Win32
-		{560E20BA-9562-4AFC-A222-6B7B1956D607}.Debug|Win32.Build.0 = Debug|Win32
-		{560E20BA-9562-4AFC-A222-6B7B1956D607}.Release|Win32.ActiveCfg = Release|Win32
-		{560E20BA-9562-4AFC-A222-6B7B1956D607}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

cocos2d-win32.sln

@@ -8,9 +8,6 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCocosDenshion", "CocosDenshion\proj.win32\CocosDenshion.win32.vcproj", "{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d", "cocos2dx\proj.win32\cocos2d-win32.vcproj", "{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{0FFD8DD8-E33F-4DE2-98BD-F94D7AA87D8A} = {0FFD8DD8-E33F-4DE2-98BD-F94D7AA87D8A}
-	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloWorld", "HelloWorld\win32\HelloWorld.win32.vcproj", "{B8BF9E81-35FD-4582-BA1C-B85FA365BABB}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -25,8 +22,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tests", "tests\test.win32\t
 		{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6} = {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libPlatformSupport", "platform_support\proj.win32\libPlatformSupport.win32.vcproj", "{0FFD8DD8-E33F-4DE2-98BD-F94D7AA87D8A}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -57,10 +52,6 @@ Global
 		{76A39BB2-9B84-4C65-98A5-654D86B86F2A}.Debug|Win32.Build.0 = Debug|Win32
 		{76A39BB2-9B84-4C65-98A5-654D86B86F2A}.Release|Win32.ActiveCfg = Release|Win32
 		{76A39BB2-9B84-4C65-98A5-654D86B86F2A}.Release|Win32.Build.0 = Release|Win32
-		{0FFD8DD8-E33F-4DE2-98BD-F94D7AA87D8A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0FFD8DD8-E33F-4DE2-98BD-F94D7AA87D8A}.Debug|Win32.Build.0 = Debug|Win32
-		{0FFD8DD8-E33F-4DE2-98BD-F94D7AA87D8A}.Release|Win32.ActiveCfg = Release|Win32
-		{0FFD8DD8-E33F-4DE2-98BD-F94D7AA87D8A}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

cocos2dx/Android.mk

@@ -54,6 +54,11 @@ platform/CCGrid_mobile.cpp \
 platform/CCLayer_mobile.cpp \
 platform/CCMenu_mobile.cpp \
 platform/CCNode_mobile.cpp \
+platform/CCGL.cpp \
+platform/CCImage.cpp \
+platform/CCStdC.cpp \
+platform/CCThread.cpp \
+platform/CCCommon.cpp \
 platform/CCParticleSystemPoint_mobile.cpp \
 platform/CCTransition_mobile.cpp \
 platform/platform.cpp \
@@ -92,35 +97,28 @@ tileMap_parallax_nodes/CCTileMapAtlas.cpp \
 touch_dispatcher/CCTouchDispatcher.cpp \
 touch_dispatcher/CCTouchHandler.cpp
 
-# platform_support
-LOCAL_SRC_FILES += ../platform_support/src/ccxGL.cpp \
-                   ../platform_support/src/CCImage.cpp \
-                   ../platform_support/src/CCStdC.cpp \
-                   ../platform_support/src/CCThread.cpp \
-                   ../platform_support/src/CCCommon.cpp
-
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/ \
                     $(LOCAL_PATH)/include \
-                    $(LOCAL_PATH)/../platform_support/include \
-                    $(LOCAL_PATH)/../platform_support/third_party/android/iconv \
-                    $(LOCAL_PATH)/../platform_support/third_party/android/libpng \
-                    $(LOCAL_PATH)/../platform_support/third_party/android/libxml2 \
-                    $(LOCAL_PATH)/../platform_support/third_party/android/libjpeg \
-                    $(LOCAL_PATH)/../platform_support/third_party/android/skia/core \
-                    $(LOCAL_PATH)/../platform_support/third_party/android/skia/animator \
-                    $(LOCAL_PATH)/../platform_support/third_party/android/skia/config \
-                    $(LOCAL_PATH)/../platform_support/third_party/android/skia/effects \
-                    $(LOCAL_PATH)/../platform_support/third_party/android/skia/images \
-                    $(LOCAL_PATH)/../platform_support/third_party/android/skia/pdf \
-                    $(LOCAL_PATH)/../platform_support/third_party/android/skia/ports \
-                    $(LOCAL_PATH)/../platform_support/third_party/android/skia/svg \
-                    $(LOCAL_PATH)/../platform_support/third_party/android/skia/text \
-                    $(LOCAL_PATH)/../platform_support/third_party/android/skia/utils \
-                    $(LOCAL_PATH)/../platform_support/third_party/android/skia/views \
-                    $(LOCAL_PATH)/../platform_support/third_party/android/skia/xml
+                    $(LOCAL_PATH)/platform \
+                    $(LOCAL_PATH)/platform/third_party/android/iconv \
+                    $(LOCAL_PATH)/platform/third_party/android/libpng \
+                    $(LOCAL_PATH)/platform/third_party/android/libxml2 \
+                    $(LOCAL_PATH)/platform/third_party/android/libjpeg \
+                    $(LOCAL_PATH)/platform/third_party/android/skia/core \
+                    $(LOCAL_PATH)/platform/third_party/android/skia/animator \
+                    $(LOCAL_PATH)/platform/third_party/android/skia/config \
+                    $(LOCAL_PATH)/platform/third_party/android/skia/effects \
+                    $(LOCAL_PATH)/platform/third_party/android/skia/images \
+                    $(LOCAL_PATH)/platform/third_party/android/skia/pdf \
+                    $(LOCAL_PATH)/platform/third_party/android/skia/ports \
+                    $(LOCAL_PATH)/platform/third_party/android/skia/svg \
+                    $(LOCAL_PATH)/platform/third_party/android/skia/text \
+                    $(LOCAL_PATH)/platform/third_party/android/skia/utils \
+                    $(LOCAL_PATH)/platform/third_party/android/skia/views \
+                    $(LOCAL_PATH)/platform/third_party/android/skia/xml
 
 #it is used for ndk-r4
-LOCAL_LDLIBS := -L$(LOCAL_PATH)/../platform_support/third_party/android/libraries \
+LOCAL_LDLIBS := -L$(LOCAL_PATH)/platform/third_party/android/libraries \
                 -lGLESv1_CM -llog -lz \
                 -lpng \
                 -lxml2 \
@@ -130,7 +128,7 @@ LOCAL_LDLIBS := -L$(LOCAL_PATH)/../platform_support/third_party/android/librarie
 # it is used for ndk-r5    
 # because the new Windows toolchain doesn't support Cygwin's drive
 # mapping (i.e /cygdrive/c/ instead of C:/)  
-#LOCAL_LDLIBS := -L$(call host-path, $(LOCAL_PATH)/../platform_support/third_party/android/libraries) \
+#LOCAL_LDLIBS := -L$(call host-path, $(LOCAL_PATH)/platform/third_party/android/libraries) \
 #                -lGLESv1_CM -llog -lz \
 #                -lpng \
 #                -lxml2 \

cocos2dx/include/CCTextureCache.h

@@ -32,7 +32,7 @@ THE SOFTWARE.
 namespace   cocos2d {
 class CCTexture2D;
 class CCAsyncObject;
-class NSLock;
+class CCLock;
 class CCImage;
 
 typedef void (*fpAsyncCallback)(CCTexture2D*, void*);
@@ -45,8 +45,8 @@ class CC_DLL CCTextureCache : public CCObject
 {
 protected:
 	CCMutableDictionary<std::string, CCTexture2D*> * m_pTextures;
-	NSLock				*m_pDictLock;
-	NSLock				*m_pContextLock;
+	CCLock				*m_pDictLock;
+	CCLock				*m_pContextLock;
 
 private:
 	// @todo void addImageWithAsyncObject(CCAsyncObject* async);

cocos2dx/include/FileUtils.h

@@ -25,7 +25,8 @@ THE SOFTWARE.
 #ifndef __SUPPORT_FILE_SUPPORT_FILEUTILS_H__
 #define __SUPPORT_FILE_SUPPORT_FILEUTILS_H__
 
-#include "ccxString.h"
+#include "CCCommon.h"
+#include <string>
 
 namespace cocos2d {
 
@@ -55,7 +56,7 @@ class CC_DLL FileUtils
     @returns const char * without the HD suffix
     @since v0.99.5
     */
-    static ccxString& ccRemoveHDSuffixFromFile(ccxString& path);
+    static std::string& ccRemoveHDSuffixFromFile(std::string& path);
 };
 
 } // namespace cocos2d

platform_support/include/CCCommon.h → cocos2dx/platform/CCCommon.h

@@ -45,7 +45,7 @@ static const int kMaxLogLen = 255;
 /**
 @brief	Output Debug message.
 */
-void CC_DLL_PS CCLog(const char * pszFormat, ...);
+void CC_DLL CCLog(const char * pszFormat, ...);
 
 struct ccxNullDeleter       { template< class TPTR > void operator()(TPTR ) {} };
 struct ccxNewDeleter        { template< class TPTR > void operator()(TPTR p) { delete p; } };
@@ -83,7 +83,7 @@ class ccxScopedPtr   // noncopyable
 @brief	A simple scoped point for array.
 */
 template< class T, class D = ccxNewArrayDeleter >
-class CC_DLL_PS ccxScopedArray // noncopyable
+class CC_DLL ccxScopedArray // noncopyable
     : private D
 {
 public:

platform_support/src/ccxGL.cpp → cocos2dx/platform/CCGL.cpp

@@ -1,33 +1,33 @@
-/****************************************************************************
-Copyright (c) 2010 cocos2d-x.org
-
-http://www.cocos2d-x.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-****************************************************************************/
-
-#include "ccxGL.h"
-
-#if defined(CC_PLATFORM_MOBILE)
-
-#include "CCStdC.h"
-
+/****************************************************************************
+Copyright (c) 2010 cocos2d-x.org
+
+http://www.cocos2d-x.org
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+****************************************************************************/
+
+#include "CCGL.h"
+
+#if defined(CC_PLATFORM_MOBILE)
+
+#include "CCStdC.h"
+
 NS_CC_BEGIN;
 
 void gluPerspective(GLfloat fovy, GLfloat aspect, GLfloat zNear, GLfloat zFar)
@@ -126,8 +126,8 @@ void gluLookAt(float fEyeX, float fEyeY, float fEyeZ,
 
     /* Translate Eye to Origin */
     glTranslatef(-fEyeX, -fEyeY, -fEyeZ);
-}
-
-NS_CC_END;
-
-#endif  // CC_PLATFORM_MOBILE
+}
+
+NS_CC_END;
+
+#endif  // CC_PLATFORM_MOBILE