diff --git a/cocos2d-win32.sln b/cocos2d-win32.sln index bed8522201..7328552f1b 100644 --- a/cocos2d-win32.sln +++ b/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 diff --git a/platform_support/src/CCCommon.cpp b/cocos2dx/platform/CCCommon.cpp similarity index 100% rename from platform_support/src/CCCommon.cpp rename to cocos2dx/platform/CCCommon.cpp diff --git a/platform_support/include/CCCommon.h b/cocos2dx/platform/CCCommon.h similarity index 100% rename from platform_support/include/CCCommon.h rename to cocos2dx/platform/CCCommon.h diff --git a/platform_support/src/ccxGL.cpp b/cocos2dx/platform/CCGL.cpp similarity index 98% rename from platform_support/src/ccxGL.cpp rename to cocos2dx/platform/CCGL.cpp index 83b2bbb7ac..b50eaf176d 100644 --- a/platform_support/src/ccxGL.cpp +++ b/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 diff --git a/cocos2dx/platform/CCGL.h b/cocos2dx/platform/CCGL.h index 3f705aaf15..cc90fdc092 100644 --- a/cocos2dx/platform/CCGL.h +++ b/cocos2dx/platform/CCGL.h @@ -1,25 +1,25 @@ -/**************************************************************************** -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. +/**************************************************************************** +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. ****************************************************************************/ #ifndef __PLATFOMR_CCGL_H__ @@ -29,9 +29,8 @@ THE SOFTWARE. // Common layer for OpenGL stuff // -#include "ccxGL.h" -#include "CCEGLView.h" - +#include "CCEGLView.h" + // iOS #if defined(CC_PLATFORM_MOBILE) #define CC_GLVIEW cocos2d::CCEGLView @@ -70,4 +69,51 @@ THE SOFTWARE. #endif +#include "CCCommon.h" + +#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) +#include "OpenGLES/ES1/gl.h" +#include "OpenGLES/ES1/glext.h" +#endif + +#if (CC_TARGET_PLATFORM == CC_PLATFORM_MAC) +#include +#include +#endif + +#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) +#include +#include +#endif + +#if (CC_TARGET_PLATFORM == CC_PLATFORM_UPHONE) +#include +#include +#endif + +#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) +#include +#include +#endif + +#if defined(CC_PLATFORM_MOBILE) + +NS_CC_BEGIN; + +/* +OpenGL GLU implementation +*/ + +/** OpenGL gluLookAt implementation */ +void CC_DLL_PS gluLookAt(GLfloat fEyeX, GLfloat fEyeY, GLfloat fEyeZ, + GLfloat fLookAtX, GLfloat fLookAtY, GLfloat fLookAtZ, + GLfloat fUpX, GLfloat fUpY, GLfloat fUpZ); + +/** OpenGL gluPerspective implementation */ +void CC_DLL_PS gluPerspective(GLfloat fovy, GLfloat aspect, GLfloat zNear, GLfloat zFar); + +NS_CC_END; + +#endif + #endif // __PLATFOMR_CCGL_H__ diff --git a/platform_support/src/CCImage.cpp b/cocos2dx/platform/CCImage.cpp similarity index 100% rename from platform_support/src/CCImage.cpp rename to cocos2dx/platform/CCImage.cpp diff --git a/platform_support/include/CCImage.h b/cocos2dx/platform/CCImage.h similarity index 100% rename from platform_support/include/CCImage.h rename to cocos2dx/platform/CCImage.h diff --git a/platform_support/include/CCLibxml2.h b/cocos2dx/platform/CCLibxml2.h similarity index 100% rename from platform_support/include/CCLibxml2.h rename to cocos2dx/platform/CCLibxml2.h diff --git a/platform_support/include/CCPlatformConfig.h b/cocos2dx/platform/CCPlatformConfig.h similarity index 100% rename from platform_support/include/CCPlatformConfig.h rename to cocos2dx/platform/CCPlatformConfig.h diff --git a/cocos2dx/platform/CCPlatformMacros.h b/cocos2dx/platform/CCPlatformMacros.h index 4fbd06002d..e986f08d1b 100644 --- a/cocos2dx/platform/CCPlatformMacros.h +++ b/cocos2dx/platform/CCPlatformMacros.h @@ -37,16 +37,140 @@ #include "platform/MacGLView.h" #endif -/** @def CC_ENABLE_CACHE_TEXTTURE_DATA -Enable it if you want to cache the texture data. -Basically,it's only enabled in android - -It's new in cocos2d-x since v0.99.5 -*/ -#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) - #define CC_ENABLE_CACHE_TEXTTURE_DATA 1 -#else - #define CC_ENABLE_CACHE_TEXTTURE_DATA 0 +/** @def CC_ENABLE_CACHE_TEXTTURE_DATA +Enable it if you want to cache the texture data. +Basically,it's only enabled in android + +It's new in cocos2d-x since v0.99.5 +*/ +#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) + #define CC_ENABLE_CACHE_TEXTTURE_DATA 1 +#else + #define CC_ENABLE_CACHE_TEXTTURE_DATA 0 #endif + +// generic macros + +// namespace cocos2d {} +#define NS_CC_BEGIN namespace cocos2d { +#define NS_CC_END } +#define USING_NS_CC using namespace cocos2d + +/** CC_PROPERTY_READONLY is used to declare a protected variable. + We can use getter to read the variable. + @param varType : the type of variable. + @param varName : variable name. + @param funName : "get + funName" is the name of the getter. + @warning : The getter is a public virtual function, you should rewrite it first. + The variables and methods declared after CC_PROPERTY_READONLY are all public. + If you need protected or private, please declare. + */ +#define CC_PROPERTY_READONLY(varType, varName, funName)\ +protected: varType varName;\ +public: virtual varType get##funName(void); + +/** CC_PROPERTY is used to declare a protected variable. + We can use getter to read the variable, and use the setter to change the variable. + @param varType : the type of variable. + @param varName : variable name. + @param funName : "get + funName" is the name of the getter. + "set + funName" is the name of the setter. + @warning : The getter and setter are public virtual functions, you should rewrite them first. + The variables and methods declared after CC_PROPERTY are all public. + If you need protected or private, please declare. + */ +#define CC_PROPERTY(varType, varName, funName)\ +protected: varType varName;\ +public: virtual varType get##funName(void);\ +public: virtual void set##funName(varType var); + +/** CC_SYNTHESIZE_READONLY is used to declare a protected variable. + We can use getter to read the variable. + @param varType : the type of variable. + @param varName : variable name. + @param funName : "get + funName" is the name of the getter. + @warning : The getter is a public inline function. + The variables and methods declared after CC_SYNTHESIZE_READONLY are all public. + If you need protected or private, please declare. + */ +#define CC_SYNTHESIZE_READONLY(varType, varName, funName)\ +protected: varType varName;\ +public: inline varType get##funName(void) const { return varName; } + +/** CC_SYNTHESIZE is used to declare a protected variable. + We can use getter to read the variable, and use the setter to change the variable. + @param varType : the type of variable. + @param varName : variable name. + @param funName : "get + funName" is the name of the getter. + "set + funName" is the name of the setter. + @warning : The getter and setter are public inline functions. + The variables and methods declared after CC_SYNTHESIZE are all public. + If you need protected or private, please declare. + */ +#define CC_SYNTHESIZE(varType, varName, funName)\ +protected: varType varName;\ +public: inline varType get##funName(void) const { return varName; }\ +public: inline void set##funName(varType var){ varName = var; } + +#define CC_SAFE_DELETE(p) if(p) { delete p; p = 0; } +#define CC_SAFE_DELETE_ARRAY(p) if(p) { delete[] p; p = 0; } +#define CC_SAFE_FREE(p) if(p) { free(p); p = 0; } +#define CC_SAFE_RELEASE(p) if(p) { p->release(); } +#define CC_SAFE_RELEASE_NULL(p) if(p) { p->release(); p = 0; } +#define CC_SAFE_RETAIN(p) if(p) { p->retain(); } +#define CC_BREAK_IF(cond) if(cond) break; + + +// cocos2d debug +#if !defined(COCOS2D_DEBUG) || COCOS2D_DEBUG == 0 +#define CCLOG(...) do {} while (0) +#define CCLOGINFO(...) do {} while (0) +#define CCLOGERROR(...) do {} while (0) + +#elif COCOS2D_DEBUG == 1 +#define CCLOG(format, ...) cocos2d::CCLog(format, ##__VA_ARGS__) +#define CCLOGERROR(format,...) cocos2d::CCLog(format, ##__VA_ARGS__) +#define CCLOGINFO(format,...) do {} while (0) + +#elif COCOS2D_DEBUG > 1 +#define CCLOG(format, ...) cocos2d::CCLog(format, ##__VA_ARGS__) +#define CCLOGERROR(format,...) cocos2d::CCLog(format, ##__VA_ARGS__) +#define CCLOGINFO(format,...) cocos2d::CCLog(format, ##__VA_ARGS__) +#endif // COCOS2D_DEBUG + +// shared library declartor +#define CC_DLL + +// assertion +#include +#define CC_ASSERT(cond) assert(cond) + +// platform depended macros + +#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) + + #undef CC_DLL + #if defined(_USRDLL) + #define CC_DLL __declspec(dllexport) + #else /* use a DLL library */ + #define CC_DLL __declspec(dllimport) + #endif + +#endif // CC_PLATFORM_WIN32 + +#if (CC_TARGET_PLATFORM == CC_PLATFORM_UPHONE && defined(_TRANZDA_VM_)) + + #undef CC_DLL + #if defined(SS_MAKEDLL) + #define CC_DLL __declspec(dllexport) + #else /* use a DLL library */ + #define CC_DLL __declspec(dllimport) + #endif + +#endif // uphone VM + +// shared library declator for platform_support project +#define CC_DLL_PS CC_DLL + #endif // __CC_PLATFORM_MACROS_H__ diff --git a/platform_support/src/CCStdC.cpp b/cocos2dx/platform/CCStdC.cpp similarity index 100% rename from platform_support/src/CCStdC.cpp rename to cocos2dx/platform/CCStdC.cpp diff --git a/platform_support/include/CCStdC.h b/cocos2dx/platform/CCStdC.h similarity index 100% rename from platform_support/include/CCStdC.h rename to cocos2dx/platform/CCStdC.h diff --git a/platform_support/src/CCThread.cpp b/cocos2dx/platform/CCThread.cpp similarity index 100% rename from platform_support/src/CCThread.cpp rename to cocos2dx/platform/CCThread.cpp diff --git a/platform_support/include/CCThread.h b/cocos2dx/platform/CCThread.h similarity index 100% rename from platform_support/include/CCThread.h rename to cocos2dx/platform/CCThread.h diff --git a/platform_support/src/android/CCImage_android.cpp b/cocos2dx/platform/android/CCImage_android.cpp similarity index 100% rename from platform_support/src/android/CCImage_android.cpp rename to cocos2dx/platform/android/CCImage_android.cpp diff --git a/platform_support/src/android/CCThread_android.cpp b/cocos2dx/platform/android/CCThread_android.cpp similarity index 100% rename from platform_support/src/android/CCThread_android.cpp rename to cocos2dx/platform/android/CCThread_android.cpp diff --git a/platform_support/include/ccxString.h b/cocos2dx/platform/ccxString.h similarity index 100% rename from platform_support/include/ccxString.h rename to cocos2dx/platform/ccxString.h diff --git a/platform_support/src/ios/CCImage_ios.mm b/cocos2dx/platform/ios/CCImage_ios.mm similarity index 100% rename from platform_support/src/ios/CCImage_ios.mm rename to cocos2dx/platform/ios/CCImage_ios.mm diff --git a/platform_support/third_party/android/iconv/iconv.h b/cocos2dx/platform/third_party/android/iconv/iconv.h similarity index 100% rename from platform_support/third_party/android/iconv/iconv.h rename to cocos2dx/platform/third_party/android/iconv/iconv.h diff --git a/platform_support/third_party/android/libjpeg/jconfig.h b/cocos2dx/platform/third_party/android/libjpeg/jconfig.h similarity index 100% rename from platform_support/third_party/android/libjpeg/jconfig.h rename to cocos2dx/platform/third_party/android/libjpeg/jconfig.h diff --git a/platform_support/third_party/android/libjpeg/jconfig_linux.h b/cocos2dx/platform/third_party/android/libjpeg/jconfig_linux.h similarity index 100% rename from platform_support/third_party/android/libjpeg/jconfig_linux.h rename to cocos2dx/platform/third_party/android/libjpeg/jconfig_linux.h diff --git a/platform_support/third_party/android/libjpeg/jconfig_win.h b/cocos2dx/platform/third_party/android/libjpeg/jconfig_win.h similarity index 100% rename from platform_support/third_party/android/libjpeg/jconfig_win.h rename to cocos2dx/platform/third_party/android/libjpeg/jconfig_win.h diff --git a/platform_support/third_party/android/libjpeg/jerror.h b/cocos2dx/platform/third_party/android/libjpeg/jerror.h similarity index 100% rename from platform_support/third_party/android/libjpeg/jerror.h rename to cocos2dx/platform/third_party/android/libjpeg/jerror.h diff --git a/platform_support/third_party/android/libjpeg/jmorecfg.h b/cocos2dx/platform/third_party/android/libjpeg/jmorecfg.h similarity index 100% rename from platform_support/third_party/android/libjpeg/jmorecfg.h rename to cocos2dx/platform/third_party/android/libjpeg/jmorecfg.h diff --git a/platform_support/third_party/android/libjpeg/jpeglib.h b/cocos2dx/platform/third_party/android/libjpeg/jpeglib.h similarity index 100% rename from platform_support/third_party/android/libjpeg/jpeglib.h rename to cocos2dx/platform/third_party/android/libjpeg/jpeglib.h diff --git a/platform_support/third_party/android/libpng/png.h.REMOVED.git-id b/cocos2dx/platform/third_party/android/libpng/png.h.REMOVED.git-id similarity index 100% rename from platform_support/third_party/android/libpng/png.h.REMOVED.git-id rename to cocos2dx/platform/third_party/android/libpng/png.h.REMOVED.git-id diff --git a/platform_support/third_party/android/libpng/pngconf.h b/cocos2dx/platform/third_party/android/libpng/pngconf.h similarity index 100% rename from platform_support/third_party/android/libpng/pngconf.h rename to cocos2dx/platform/third_party/android/libpng/pngconf.h diff --git a/platform_support/third_party/android/libraries/libjpeg.a.REMOVED.git-id b/cocos2dx/platform/third_party/android/libraries/libjpeg.a.REMOVED.git-id similarity index 100% rename from platform_support/third_party/android/libraries/libjpeg.a.REMOVED.git-id rename to cocos2dx/platform/third_party/android/libraries/libjpeg.a.REMOVED.git-id diff --git a/platform_support/third_party/android/libraries/libpng.a.REMOVED.git-id b/cocos2dx/platform/third_party/android/libraries/libpng.a.REMOVED.git-id similarity index 100% rename from platform_support/third_party/android/libraries/libpng.a.REMOVED.git-id rename to cocos2dx/platform/third_party/android/libraries/libpng.a.REMOVED.git-id diff --git a/platform_support/third_party/android/libraries/libsgl.so.REMOVED.git-id b/cocos2dx/platform/third_party/android/libraries/libsgl.so.REMOVED.git-id similarity index 100% rename from platform_support/third_party/android/libraries/libsgl.so.REMOVED.git-id rename to cocos2dx/platform/third_party/android/libraries/libsgl.so.REMOVED.git-id diff --git a/platform_support/third_party/android/libraries/libskia.so.REMOVED.git-id b/cocos2dx/platform/third_party/android/libraries/libskia.so.REMOVED.git-id similarity index 100% rename from platform_support/third_party/android/libraries/libskia.so.REMOVED.git-id rename to cocos2dx/platform/third_party/android/libraries/libskia.so.REMOVED.git-id diff --git a/platform_support/third_party/android/libraries/libxml2.a.REMOVED.git-id b/cocos2dx/platform/third_party/android/libraries/libxml2.a.REMOVED.git-id similarity index 100% rename from platform_support/third_party/android/libraries/libxml2.a.REMOVED.git-id rename to cocos2dx/platform/third_party/android/libraries/libxml2.a.REMOVED.git-id diff --git a/platform_support/third_party/android/libxml2/libxml/DOCBparser.h b/cocos2dx/platform/third_party/android/libxml2/libxml/DOCBparser.h similarity index 100% rename from platform_support/third_party/android/libxml2/libxml/DOCBparser.h rename to cocos2dx/platform/third_party/android/libxml2/libxml/DOCBparser.h diff --git a/platform_support/third_party/android/libxml2/libxml/HTMLparser.h b/cocos2dx/platform/third_party/android/libxml2/libxml/HTMLparser.h similarity index 100% rename from platform_support/third_party/android/libxml2/libxml/HTMLparser.h rename to cocos2dx/platform/third_party/android/libxml2/libxml/HTMLparser.h diff --git a/platform_support/third_party/android/libxml2/libxml/HTMLtree.h b/cocos2dx/platform/third_party/android/libxml2/libxml/HTMLtree.h similarity index 100% rename from platform_support/third_party/android/libxml2/libxml/HTMLtree.h rename to cocos2dx/platform/third_party/android/libxml2/libxml/HTMLtree.h diff --git a/platform_support/third_party/android/libxml2/libxml/SAX.h b/cocos2dx/platform/third_party/android/libxml2/libxml/SAX.h similarity index 100% rename from platform_support/third_party/android/libxml2/libxml/SAX.h rename to cocos2dx/platform/third_party/android/libxml2/libxml/SAX.h diff --git a/platform_support/third_party/android/libxml2/libxml/SAX2.h b/cocos2dx/platform/third_party/android/libxml2/libxml/SAX2.h similarity index 100% rename from platform_support/third_party/android/libxml2/libxml/SAX2.h rename to cocos2dx/platform/third_party/android/libxml2/libxml/SAX2.h diff --git a/platform_support/third_party/android/libxml2/libxml/c14n.h b/cocos2dx/platform/third_party/android/libxml2/libxml/c14n.h similarity index 100% rename from platform_support/third_party/android/libxml2/libxml/c14n.h rename to cocos2dx/platform/third_party/android/libxml2/libxml/c14n.h diff --git a/platform_support/third_party/android/libxml2/libxml/catalog.h b/cocos2dx/platform/third_party/android/libxml2/libxml/catalog.h similarity index 100% rename from platform_support/third_party/android/libxml2/libxml/catalog.h rename to cocos2dx/platform/third_party/android/libxml2/libxml/catalog.h diff --git a/platform_support/third_party/android/libxml2/libxml/chvalid.h b/cocos2dx/platform/third_party/android/libxml2/libxml/chvalid.h similarity index 100% rename from platform_support/third_party/android/libxml2/libxml/chvalid.h rename to cocos2dx/platform/third_party/android/libxml2/libxml/chvalid.h diff --git a/platform_support/third_party/android/libxml2/libxml/debugXML.h b/cocos2dx/platform/third_party/android/libxml2/libxml/debugXML.h similarity index 100% rename from platform_support/third_party/android/libxml2/libxml/debugXML.h rename to cocos2dx/platform/third_party/android/libxml2/libxml/debugXML.h diff --git a/platform_support/third_party/android/libxml2/libxml/dict.h b/cocos2dx/platform/third_party/android/libxml2/libxml/dict.h similarity index 100% rename from platform_support/third_party/android/libxml2/libxml/dict.h rename to cocos2dx/platform/third_party/android/libxml2/libxml/dict.h diff --git a/platform_support/third_party/android/libxml2/libxml/encoding.h b/cocos2dx/platform/third_party/android/libxml2/libxml/encoding.h similarity index 100% rename from platform_support/third_party/android/libxml2/libxml/encoding.h rename to cocos2dx/platform/third_party/android/libxml2/libxml/encoding.h diff --git a/platform_support/third_party/android/libxml2/libxml/entities.h b/cocos2dx/platform/third_party/android/libxml2/libxml/entities.h similarity index 100% rename from platform_support/third_party/android/libxml2/libxml/entities.h rename to cocos2dx/platform/third_party/android/libxml2/libxml/entities.h diff --git a/platform_support/third_party/android/libxml2/libxml/globals.h b/cocos2dx/platform/third_party/android/libxml2/libxml/globals.h similarity index 100% rename from platform_support/third_party/android/libxml2/libxml/globals.h rename to cocos2dx/platform/third_party/android/libxml2/libxml/globals.h diff --git a/platform_support/third_party/android/libxml2/libxml/hash.h b/cocos2dx/platform/third_party/android/libxml2/libxml/hash.h similarity index 100% rename from platform_support/third_party/android/libxml2/libxml/hash.h rename to cocos2dx/platform/third_party/android/libxml2/libxml/hash.h diff --git a/platform_support/third_party/android/libxml2/libxml/list.h b/cocos2dx/platform/third_party/android/libxml2/libxml/list.h similarity index 100% rename from platform_support/third_party/android/libxml2/libxml/list.h rename to cocos2dx/platform/third_party/android/libxml2/libxml/list.h diff --git a/platform_support/third_party/android/libxml2/libxml/nanoftp.h b/cocos2dx/platform/third_party/android/libxml2/libxml/nanoftp.h similarity index 100% rename from platform_support/third_party/android/libxml2/libxml/nanoftp.h rename to cocos2dx/platform/third_party/android/libxml2/libxml/nanoftp.h diff --git a/platform_support/third_party/android/libxml2/libxml/nanohttp.h b/cocos2dx/platform/third_party/android/libxml2/libxml/nanohttp.h similarity index 100% rename from platform_support/third_party/android/libxml2/libxml/nanohttp.h rename to cocos2dx/platform/third_party/android/libxml2/libxml/nanohttp.h diff --git a/platform_support/third_party/android/libxml2/libxml/parser.h b/cocos2dx/platform/third_party/android/libxml2/libxml/parser.h similarity index 100% rename from platform_support/third_party/android/libxml2/libxml/parser.h rename to cocos2dx/platform/third_party/android/libxml2/libxml/parser.h diff --git a/platform_support/third_party/android/libxml2/libxml/parserInternals.h b/cocos2dx/platform/third_party/android/libxml2/libxml/parserInternals.h similarity index 100% rename from platform_support/third_party/android/libxml2/libxml/parserInternals.h rename to cocos2dx/platform/third_party/android/libxml2/libxml/parserInternals.h diff --git a/platform_support/third_party/android/libxml2/libxml/pattern.h b/cocos2dx/platform/third_party/android/libxml2/libxml/pattern.h similarity index 100% rename from platform_support/third_party/android/libxml2/libxml/pattern.h rename to cocos2dx/platform/third_party/android/libxml2/libxml/pattern.h diff --git a/platform_support/third_party/android/libxml2/libxml/relaxng.h b/cocos2dx/platform/third_party/android/libxml2/libxml/relaxng.h similarity index 100% rename from platform_support/third_party/android/libxml2/libxml/relaxng.h rename to cocos2dx/platform/third_party/android/libxml2/libxml/relaxng.h diff --git a/platform_support/third_party/android/libxml2/libxml/schemasInternals.h b/cocos2dx/platform/third_party/android/libxml2/libxml/schemasInternals.h similarity index 100% rename from platform_support/third_party/android/libxml2/libxml/schemasInternals.h rename to cocos2dx/platform/third_party/android/libxml2/libxml/schemasInternals.h diff --git a/platform_support/third_party/android/libxml2/libxml/schematron.h b/cocos2dx/platform/third_party/android/libxml2/libxml/schematron.h similarity index 100% rename from platform_support/third_party/android/libxml2/libxml/schematron.h rename to cocos2dx/platform/third_party/android/libxml2/libxml/schematron.h diff --git a/platform_support/third_party/android/libxml2/libxml/threads.h b/cocos2dx/platform/third_party/android/libxml2/libxml/threads.h similarity index 100% rename from platform_support/third_party/android/libxml2/libxml/threads.h rename to cocos2dx/platform/third_party/android/libxml2/libxml/threads.h diff --git a/platform_support/third_party/android/libxml2/libxml/tree.h b/cocos2dx/platform/third_party/android/libxml2/libxml/tree.h similarity index 100% rename from platform_support/third_party/android/libxml2/libxml/tree.h rename to cocos2dx/platform/third_party/android/libxml2/libxml/tree.h diff --git a/platform_support/third_party/android/libxml2/libxml/uri.h b/cocos2dx/platform/third_party/android/libxml2/libxml/uri.h similarity index 100% rename from platform_support/third_party/android/libxml2/libxml/uri.h rename to cocos2dx/platform/third_party/android/libxml2/libxml/uri.h diff --git a/platform_support/third_party/android/libxml2/libxml/valid.h b/cocos2dx/platform/third_party/android/libxml2/libxml/valid.h similarity index 100% rename from platform_support/third_party/android/libxml2/libxml/valid.h rename to cocos2dx/platform/third_party/android/libxml2/libxml/valid.h diff --git a/platform_support/third_party/android/libxml2/libxml/xinclude.h b/cocos2dx/platform/third_party/android/libxml2/libxml/xinclude.h similarity index 100% rename from platform_support/third_party/android/libxml2/libxml/xinclude.h rename to cocos2dx/platform/third_party/android/libxml2/libxml/xinclude.h diff --git a/platform_support/third_party/android/libxml2/libxml/xlink.h b/cocos2dx/platform/third_party/android/libxml2/libxml/xlink.h similarity index 100% rename from platform_support/third_party/android/libxml2/libxml/xlink.h rename to cocos2dx/platform/third_party/android/libxml2/libxml/xlink.h diff --git a/platform_support/third_party/android/libxml2/libxml/xmlIO.h b/cocos2dx/platform/third_party/android/libxml2/libxml/xmlIO.h similarity index 100% rename from platform_support/third_party/android/libxml2/libxml/xmlIO.h rename to cocos2dx/platform/third_party/android/libxml2/libxml/xmlIO.h diff --git a/platform_support/third_party/android/libxml2/libxml/xmlautomata.h b/cocos2dx/platform/third_party/android/libxml2/libxml/xmlautomata.h similarity index 100% rename from platform_support/third_party/android/libxml2/libxml/xmlautomata.h rename to cocos2dx/platform/third_party/android/libxml2/libxml/xmlautomata.h diff --git a/platform_support/third_party/android/libxml2/libxml/xmlerror.h b/cocos2dx/platform/third_party/android/libxml2/libxml/xmlerror.h similarity index 100% rename from platform_support/third_party/android/libxml2/libxml/xmlerror.h rename to cocos2dx/platform/third_party/android/libxml2/libxml/xmlerror.h diff --git a/platform_support/third_party/android/libxml2/libxml/xmlexports.h b/cocos2dx/platform/third_party/android/libxml2/libxml/xmlexports.h similarity index 100% rename from platform_support/third_party/android/libxml2/libxml/xmlexports.h rename to cocos2dx/platform/third_party/android/libxml2/libxml/xmlexports.h diff --git a/platform_support/third_party/android/libxml2/libxml/xmlmemory.h b/cocos2dx/platform/third_party/android/libxml2/libxml/xmlmemory.h similarity index 100% rename from platform_support/third_party/android/libxml2/libxml/xmlmemory.h rename to cocos2dx/platform/third_party/android/libxml2/libxml/xmlmemory.h diff --git a/platform_support/third_party/android/libxml2/libxml/xmlmodule.h b/cocos2dx/platform/third_party/android/libxml2/libxml/xmlmodule.h similarity index 100% rename from platform_support/third_party/android/libxml2/libxml/xmlmodule.h rename to cocos2dx/platform/third_party/android/libxml2/libxml/xmlmodule.h diff --git a/platform_support/third_party/android/libxml2/libxml/xmlreader.h b/cocos2dx/platform/third_party/android/libxml2/libxml/xmlreader.h similarity index 100% rename from platform_support/third_party/android/libxml2/libxml/xmlreader.h rename to cocos2dx/platform/third_party/android/libxml2/libxml/xmlreader.h diff --git a/platform_support/third_party/android/libxml2/libxml/xmlregexp.h b/cocos2dx/platform/third_party/android/libxml2/libxml/xmlregexp.h similarity index 100% rename from platform_support/third_party/android/libxml2/libxml/xmlregexp.h rename to cocos2dx/platform/third_party/android/libxml2/libxml/xmlregexp.h diff --git a/platform_support/third_party/android/libxml2/libxml/xmlsave.h b/cocos2dx/platform/third_party/android/libxml2/libxml/xmlsave.h similarity index 100% rename from platform_support/third_party/android/libxml2/libxml/xmlsave.h rename to cocos2dx/platform/third_party/android/libxml2/libxml/xmlsave.h diff --git a/platform_support/third_party/android/libxml2/libxml/xmlschemas.h b/cocos2dx/platform/third_party/android/libxml2/libxml/xmlschemas.h similarity index 100% rename from platform_support/third_party/android/libxml2/libxml/xmlschemas.h rename to cocos2dx/platform/third_party/android/libxml2/libxml/xmlschemas.h diff --git a/platform_support/third_party/android/libxml2/libxml/xmlschemastypes.h b/cocos2dx/platform/third_party/android/libxml2/libxml/xmlschemastypes.h similarity index 100% rename from platform_support/third_party/android/libxml2/libxml/xmlschemastypes.h rename to cocos2dx/platform/third_party/android/libxml2/libxml/xmlschemastypes.h diff --git a/platform_support/third_party/android/libxml2/libxml/xmlstring.h b/cocos2dx/platform/third_party/android/libxml2/libxml/xmlstring.h similarity index 100% rename from platform_support/third_party/android/libxml2/libxml/xmlstring.h rename to cocos2dx/platform/third_party/android/libxml2/libxml/xmlstring.h diff --git a/platform_support/third_party/android/libxml2/libxml/xmlunicode.h b/cocos2dx/platform/third_party/android/libxml2/libxml/xmlunicode.h similarity index 100% rename from platform_support/third_party/android/libxml2/libxml/xmlunicode.h rename to cocos2dx/platform/third_party/android/libxml2/libxml/xmlunicode.h diff --git a/platform_support/third_party/android/libxml2/libxml/xmlversion.h b/cocos2dx/platform/third_party/android/libxml2/libxml/xmlversion.h similarity index 100% rename from platform_support/third_party/android/libxml2/libxml/xmlversion.h rename to cocos2dx/platform/third_party/android/libxml2/libxml/xmlversion.h diff --git a/platform_support/third_party/android/libxml2/libxml/xmlwriter.h b/cocos2dx/platform/third_party/android/libxml2/libxml/xmlwriter.h similarity index 100% rename from platform_support/third_party/android/libxml2/libxml/xmlwriter.h rename to cocos2dx/platform/third_party/android/libxml2/libxml/xmlwriter.h diff --git a/platform_support/third_party/android/libxml2/libxml/xpath.h b/cocos2dx/platform/third_party/android/libxml2/libxml/xpath.h similarity index 100% rename from platform_support/third_party/android/libxml2/libxml/xpath.h rename to cocos2dx/platform/third_party/android/libxml2/libxml/xpath.h diff --git a/platform_support/third_party/android/libxml2/libxml/xpathInternals.h b/cocos2dx/platform/third_party/android/libxml2/libxml/xpathInternals.h similarity index 100% rename from platform_support/third_party/android/libxml2/libxml/xpathInternals.h rename to cocos2dx/platform/third_party/android/libxml2/libxml/xpathInternals.h diff --git a/platform_support/third_party/android/libxml2/libxml/xpointer.h b/cocos2dx/platform/third_party/android/libxml2/libxml/xpointer.h similarity index 100% rename from platform_support/third_party/android/libxml2/libxml/xpointer.h rename to cocos2dx/platform/third_party/android/libxml2/libxml/xpointer.h diff --git a/platform_support/third_party/android/skia/animator/SkAnimator.h b/cocos2dx/platform/third_party/android/skia/animator/SkAnimator.h similarity index 100% rename from platform_support/third_party/android/skia/animator/SkAnimator.h rename to cocos2dx/platform/third_party/android/skia/animator/SkAnimator.h diff --git a/platform_support/third_party/android/skia/animator/SkAnimatorView.h b/cocos2dx/platform/third_party/android/skia/animator/SkAnimatorView.h similarity index 100% rename from platform_support/third_party/android/skia/animator/SkAnimatorView.h rename to cocos2dx/platform/third_party/android/skia/animator/SkAnimatorView.h diff --git a/platform_support/third_party/android/skia/core/Sk64.h b/cocos2dx/platform/third_party/android/skia/core/Sk64.h similarity index 100% rename from platform_support/third_party/android/skia/core/Sk64.h rename to cocos2dx/platform/third_party/android/skia/core/Sk64.h diff --git a/platform_support/third_party/android/skia/core/SkAutoKern.h b/cocos2dx/platform/third_party/android/skia/core/SkAutoKern.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkAutoKern.h rename to cocos2dx/platform/third_party/android/skia/core/SkAutoKern.h diff --git a/platform_support/third_party/android/skia/core/SkBitmap.h b/cocos2dx/platform/third_party/android/skia/core/SkBitmap.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkBitmap.h rename to cocos2dx/platform/third_party/android/skia/core/SkBitmap.h diff --git a/platform_support/third_party/android/skia/core/SkBlitRow.h b/cocos2dx/platform/third_party/android/skia/core/SkBlitRow.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkBlitRow.h rename to cocos2dx/platform/third_party/android/skia/core/SkBlitRow.h diff --git a/platform_support/third_party/android/skia/core/SkBlitter.h b/cocos2dx/platform/third_party/android/skia/core/SkBlitter.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkBlitter.h rename to cocos2dx/platform/third_party/android/skia/core/SkBlitter.h diff --git a/platform_support/third_party/android/skia/core/SkBounder.h b/cocos2dx/platform/third_party/android/skia/core/SkBounder.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkBounder.h rename to cocos2dx/platform/third_party/android/skia/core/SkBounder.h diff --git a/platform_support/third_party/android/skia/core/SkBuffer.h b/cocos2dx/platform/third_party/android/skia/core/SkBuffer.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkBuffer.h rename to cocos2dx/platform/third_party/android/skia/core/SkBuffer.h diff --git a/platform_support/third_party/android/skia/core/SkCanvas.h b/cocos2dx/platform/third_party/android/skia/core/SkCanvas.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkCanvas.h rename to cocos2dx/platform/third_party/android/skia/core/SkCanvas.h diff --git a/platform_support/third_party/android/skia/core/SkChunkAlloc.h b/cocos2dx/platform/third_party/android/skia/core/SkChunkAlloc.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkChunkAlloc.h rename to cocos2dx/platform/third_party/android/skia/core/SkChunkAlloc.h diff --git a/platform_support/third_party/android/skia/core/SkColor.h b/cocos2dx/platform/third_party/android/skia/core/SkColor.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkColor.h rename to cocos2dx/platform/third_party/android/skia/core/SkColor.h diff --git a/platform_support/third_party/android/skia/core/SkColorFilter.h b/cocos2dx/platform/third_party/android/skia/core/SkColorFilter.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkColorFilter.h rename to cocos2dx/platform/third_party/android/skia/core/SkColorFilter.h diff --git a/platform_support/third_party/android/skia/core/SkColorPriv.h b/cocos2dx/platform/third_party/android/skia/core/SkColorPriv.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkColorPriv.h rename to cocos2dx/platform/third_party/android/skia/core/SkColorPriv.h diff --git a/platform_support/third_party/android/skia/core/SkColorShader.h b/cocos2dx/platform/third_party/android/skia/core/SkColorShader.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkColorShader.h rename to cocos2dx/platform/third_party/android/skia/core/SkColorShader.h diff --git a/platform_support/third_party/android/skia/core/SkComposeShader.h b/cocos2dx/platform/third_party/android/skia/core/SkComposeShader.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkComposeShader.h rename to cocos2dx/platform/third_party/android/skia/core/SkComposeShader.h diff --git a/platform_support/third_party/android/skia/core/SkDeque.h b/cocos2dx/platform/third_party/android/skia/core/SkDeque.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkDeque.h rename to cocos2dx/platform/third_party/android/skia/core/SkDeque.h diff --git a/platform_support/third_party/android/skia/core/SkDescriptor.h b/cocos2dx/platform/third_party/android/skia/core/SkDescriptor.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkDescriptor.h rename to cocos2dx/platform/third_party/android/skia/core/SkDescriptor.h diff --git a/platform_support/third_party/android/skia/core/SkDevice.h b/cocos2dx/platform/third_party/android/skia/core/SkDevice.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkDevice.h rename to cocos2dx/platform/third_party/android/skia/core/SkDevice.h diff --git a/platform_support/third_party/android/skia/core/SkDither.h b/cocos2dx/platform/third_party/android/skia/core/SkDither.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkDither.h rename to cocos2dx/platform/third_party/android/skia/core/SkDither.h diff --git a/platform_support/third_party/android/skia/core/SkDraw.h b/cocos2dx/platform/third_party/android/skia/core/SkDraw.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkDraw.h rename to cocos2dx/platform/third_party/android/skia/core/SkDraw.h diff --git a/platform_support/third_party/android/skia/core/SkDrawFilter.h b/cocos2dx/platform/third_party/android/skia/core/SkDrawFilter.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkDrawFilter.h rename to cocos2dx/platform/third_party/android/skia/core/SkDrawFilter.h diff --git a/platform_support/third_party/android/skia/core/SkDrawLooper.h b/cocos2dx/platform/third_party/android/skia/core/SkDrawLooper.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkDrawLooper.h rename to cocos2dx/platform/third_party/android/skia/core/SkDrawLooper.h diff --git a/platform_support/third_party/android/skia/core/SkEdgeClipper.h b/cocos2dx/platform/third_party/android/skia/core/SkEdgeClipper.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkEdgeClipper.h rename to cocos2dx/platform/third_party/android/skia/core/SkEdgeClipper.h diff --git a/platform_support/third_party/android/skia/core/SkEndian.h b/cocos2dx/platform/third_party/android/skia/core/SkEndian.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkEndian.h rename to cocos2dx/platform/third_party/android/skia/core/SkEndian.h diff --git a/platform_support/third_party/android/skia/core/SkFDot6.h b/cocos2dx/platform/third_party/android/skia/core/SkFDot6.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkFDot6.h rename to cocos2dx/platform/third_party/android/skia/core/SkFDot6.h diff --git a/platform_support/third_party/android/skia/core/SkFixed.h b/cocos2dx/platform/third_party/android/skia/core/SkFixed.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkFixed.h rename to cocos2dx/platform/third_party/android/skia/core/SkFixed.h diff --git a/platform_support/third_party/android/skia/core/SkFlate.h b/cocos2dx/platform/third_party/android/skia/core/SkFlate.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkFlate.h rename to cocos2dx/platform/third_party/android/skia/core/SkFlate.h diff --git a/platform_support/third_party/android/skia/core/SkFlattenable.h b/cocos2dx/platform/third_party/android/skia/core/SkFlattenable.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkFlattenable.h rename to cocos2dx/platform/third_party/android/skia/core/SkFlattenable.h diff --git a/platform_support/third_party/android/skia/core/SkFloatBits.h b/cocos2dx/platform/third_party/android/skia/core/SkFloatBits.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkFloatBits.h rename to cocos2dx/platform/third_party/android/skia/core/SkFloatBits.h diff --git a/platform_support/third_party/android/skia/core/SkFloatingPoint.h b/cocos2dx/platform/third_party/android/skia/core/SkFloatingPoint.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkFloatingPoint.h rename to cocos2dx/platform/third_party/android/skia/core/SkFloatingPoint.h diff --git a/platform_support/third_party/android/skia/core/SkFontHost.h b/cocos2dx/platform/third_party/android/skia/core/SkFontHost.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkFontHost.h rename to cocos2dx/platform/third_party/android/skia/core/SkFontHost.h diff --git a/platform_support/third_party/android/skia/core/SkGeometry.h b/cocos2dx/platform/third_party/android/skia/core/SkGeometry.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkGeometry.h rename to cocos2dx/platform/third_party/android/skia/core/SkGeometry.h diff --git a/platform_support/third_party/android/skia/core/SkGlobals.h b/cocos2dx/platform/third_party/android/skia/core/SkGlobals.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkGlobals.h rename to cocos2dx/platform/third_party/android/skia/core/SkGlobals.h diff --git a/platform_support/third_party/android/skia/core/SkGraphics.h b/cocos2dx/platform/third_party/android/skia/core/SkGraphics.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkGraphics.h rename to cocos2dx/platform/third_party/android/skia/core/SkGraphics.h diff --git a/platform_support/third_party/android/skia/core/SkLineClipper.h b/cocos2dx/platform/third_party/android/skia/core/SkLineClipper.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkLineClipper.h rename to cocos2dx/platform/third_party/android/skia/core/SkLineClipper.h diff --git a/platform_support/third_party/android/skia/core/SkMMapStream.h b/cocos2dx/platform/third_party/android/skia/core/SkMMapStream.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkMMapStream.h rename to cocos2dx/platform/third_party/android/skia/core/SkMMapStream.h diff --git a/platform_support/third_party/android/skia/core/SkMallocPixelRef.h b/cocos2dx/platform/third_party/android/skia/core/SkMallocPixelRef.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkMallocPixelRef.h rename to cocos2dx/platform/third_party/android/skia/core/SkMallocPixelRef.h diff --git a/platform_support/third_party/android/skia/core/SkMask.h b/cocos2dx/platform/third_party/android/skia/core/SkMask.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkMask.h rename to cocos2dx/platform/third_party/android/skia/core/SkMask.h diff --git a/platform_support/third_party/android/skia/core/SkMaskFilter.h b/cocos2dx/platform/third_party/android/skia/core/SkMaskFilter.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkMaskFilter.h rename to cocos2dx/platform/third_party/android/skia/core/SkMaskFilter.h diff --git a/platform_support/third_party/android/skia/core/SkMath.h b/cocos2dx/platform/third_party/android/skia/core/SkMath.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkMath.h rename to cocos2dx/platform/third_party/android/skia/core/SkMath.h diff --git a/platform_support/third_party/android/skia/core/SkMatrix.h b/cocos2dx/platform/third_party/android/skia/core/SkMatrix.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkMatrix.h rename to cocos2dx/platform/third_party/android/skia/core/SkMatrix.h diff --git a/platform_support/third_party/android/skia/core/SkOSFile.h b/cocos2dx/platform/third_party/android/skia/core/SkOSFile.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkOSFile.h rename to cocos2dx/platform/third_party/android/skia/core/SkOSFile.h diff --git a/platform_support/third_party/android/skia/core/SkPackBits.h b/cocos2dx/platform/third_party/android/skia/core/SkPackBits.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkPackBits.h rename to cocos2dx/platform/third_party/android/skia/core/SkPackBits.h diff --git a/platform_support/third_party/android/skia/core/SkPaint.h b/cocos2dx/platform/third_party/android/skia/core/SkPaint.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkPaint.h rename to cocos2dx/platform/third_party/android/skia/core/SkPaint.h diff --git a/platform_support/third_party/android/skia/core/SkPath.h b/cocos2dx/platform/third_party/android/skia/core/SkPath.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkPath.h rename to cocos2dx/platform/third_party/android/skia/core/SkPath.h diff --git a/platform_support/third_party/android/skia/core/SkPathEffect.h b/cocos2dx/platform/third_party/android/skia/core/SkPathEffect.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkPathEffect.h rename to cocos2dx/platform/third_party/android/skia/core/SkPathEffect.h diff --git a/platform_support/third_party/android/skia/core/SkPathMeasure.h b/cocos2dx/platform/third_party/android/skia/core/SkPathMeasure.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkPathMeasure.h rename to cocos2dx/platform/third_party/android/skia/core/SkPathMeasure.h diff --git a/platform_support/third_party/android/skia/core/SkPerspIter.h b/cocos2dx/platform/third_party/android/skia/core/SkPerspIter.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkPerspIter.h rename to cocos2dx/platform/third_party/android/skia/core/SkPerspIter.h diff --git a/platform_support/third_party/android/skia/core/SkPicture.h b/cocos2dx/platform/third_party/android/skia/core/SkPicture.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkPicture.h rename to cocos2dx/platform/third_party/android/skia/core/SkPicture.h diff --git a/platform_support/third_party/android/skia/core/SkPixelRef.h b/cocos2dx/platform/third_party/android/skia/core/SkPixelRef.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkPixelRef.h rename to cocos2dx/platform/third_party/android/skia/core/SkPixelRef.h diff --git a/platform_support/third_party/android/skia/core/SkPoint.h b/cocos2dx/platform/third_party/android/skia/core/SkPoint.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkPoint.h rename to cocos2dx/platform/third_party/android/skia/core/SkPoint.h diff --git a/platform_support/third_party/android/skia/core/SkPostConfig.h b/cocos2dx/platform/third_party/android/skia/core/SkPostConfig.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkPostConfig.h rename to cocos2dx/platform/third_party/android/skia/core/SkPostConfig.h diff --git a/platform_support/third_party/android/skia/core/SkPreConfig.h b/cocos2dx/platform/third_party/android/skia/core/SkPreConfig.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkPreConfig.h rename to cocos2dx/platform/third_party/android/skia/core/SkPreConfig.h diff --git a/platform_support/third_party/android/skia/core/SkPtrRecorder.h b/cocos2dx/platform/third_party/android/skia/core/SkPtrRecorder.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkPtrRecorder.h rename to cocos2dx/platform/third_party/android/skia/core/SkPtrRecorder.h diff --git a/platform_support/third_party/android/skia/core/SkRandom.h b/cocos2dx/platform/third_party/android/skia/core/SkRandom.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkRandom.h rename to cocos2dx/platform/third_party/android/skia/core/SkRandom.h diff --git a/platform_support/third_party/android/skia/core/SkRasterizer.h b/cocos2dx/platform/third_party/android/skia/core/SkRasterizer.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkRasterizer.h rename to cocos2dx/platform/third_party/android/skia/core/SkRasterizer.h diff --git a/platform_support/third_party/android/skia/core/SkReader32.h b/cocos2dx/platform/third_party/android/skia/core/SkReader32.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkReader32.h rename to cocos2dx/platform/third_party/android/skia/core/SkReader32.h diff --git a/platform_support/third_party/android/skia/core/SkRect.h b/cocos2dx/platform/third_party/android/skia/core/SkRect.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkRect.h rename to cocos2dx/platform/third_party/android/skia/core/SkRect.h diff --git a/platform_support/third_party/android/skia/core/SkRefCnt.h b/cocos2dx/platform/third_party/android/skia/core/SkRefCnt.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkRefCnt.h rename to cocos2dx/platform/third_party/android/skia/core/SkRefCnt.h diff --git a/platform_support/third_party/android/skia/core/SkRegion.h b/cocos2dx/platform/third_party/android/skia/core/SkRegion.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkRegion.h rename to cocos2dx/platform/third_party/android/skia/core/SkRegion.h diff --git a/platform_support/third_party/android/skia/core/SkScalar.h b/cocos2dx/platform/third_party/android/skia/core/SkScalar.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkScalar.h rename to cocos2dx/platform/third_party/android/skia/core/SkScalar.h diff --git a/platform_support/third_party/android/skia/core/SkScalarCompare.h b/cocos2dx/platform/third_party/android/skia/core/SkScalarCompare.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkScalarCompare.h rename to cocos2dx/platform/third_party/android/skia/core/SkScalarCompare.h diff --git a/platform_support/third_party/android/skia/core/SkScalerContext.h b/cocos2dx/platform/third_party/android/skia/core/SkScalerContext.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkScalerContext.h rename to cocos2dx/platform/third_party/android/skia/core/SkScalerContext.h diff --git a/platform_support/third_party/android/skia/core/SkScan.h b/cocos2dx/platform/third_party/android/skia/core/SkScan.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkScan.h rename to cocos2dx/platform/third_party/android/skia/core/SkScan.h diff --git a/platform_support/third_party/android/skia/core/SkShader.h b/cocos2dx/platform/third_party/android/skia/core/SkShader.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkShader.h rename to cocos2dx/platform/third_party/android/skia/core/SkShader.h diff --git a/platform_support/third_party/android/skia/core/SkShape.h b/cocos2dx/platform/third_party/android/skia/core/SkShape.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkShape.h rename to cocos2dx/platform/third_party/android/skia/core/SkShape.h diff --git a/platform_support/third_party/android/skia/core/SkSize.h b/cocos2dx/platform/third_party/android/skia/core/SkSize.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkSize.h rename to cocos2dx/platform/third_party/android/skia/core/SkSize.h diff --git a/platform_support/third_party/android/skia/core/SkStream.h b/cocos2dx/platform/third_party/android/skia/core/SkStream.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkStream.h rename to cocos2dx/platform/third_party/android/skia/core/SkStream.h diff --git a/platform_support/third_party/android/skia/core/SkString.h b/cocos2dx/platform/third_party/android/skia/core/SkString.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkString.h rename to cocos2dx/platform/third_party/android/skia/core/SkString.h diff --git a/platform_support/third_party/android/skia/core/SkStroke.h b/cocos2dx/platform/third_party/android/skia/core/SkStroke.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkStroke.h rename to cocos2dx/platform/third_party/android/skia/core/SkStroke.h diff --git a/platform_support/third_party/android/skia/core/SkTDArray.h b/cocos2dx/platform/third_party/android/skia/core/SkTDArray.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkTDArray.h rename to cocos2dx/platform/third_party/android/skia/core/SkTDArray.h diff --git a/platform_support/third_party/android/skia/core/SkTDStack.h b/cocos2dx/platform/third_party/android/skia/core/SkTDStack.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkTDStack.h rename to cocos2dx/platform/third_party/android/skia/core/SkTDStack.h diff --git a/platform_support/third_party/android/skia/core/SkTDict.h b/cocos2dx/platform/third_party/android/skia/core/SkTDict.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkTDict.h rename to cocos2dx/platform/third_party/android/skia/core/SkTDict.h diff --git a/platform_support/third_party/android/skia/core/SkTRegistry.h b/cocos2dx/platform/third_party/android/skia/core/SkTRegistry.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkTRegistry.h rename to cocos2dx/platform/third_party/android/skia/core/SkTRegistry.h diff --git a/platform_support/third_party/android/skia/core/SkTSearch.h b/cocos2dx/platform/third_party/android/skia/core/SkTSearch.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkTSearch.h rename to cocos2dx/platform/third_party/android/skia/core/SkTSearch.h diff --git a/platform_support/third_party/android/skia/core/SkTemplates.h b/cocos2dx/platform/third_party/android/skia/core/SkTemplates.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkTemplates.h rename to cocos2dx/platform/third_party/android/skia/core/SkTemplates.h diff --git a/platform_support/third_party/android/skia/core/SkThread.h b/cocos2dx/platform/third_party/android/skia/core/SkThread.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkThread.h rename to cocos2dx/platform/third_party/android/skia/core/SkThread.h diff --git a/platform_support/third_party/android/skia/core/SkThread_platform.h b/cocos2dx/platform/third_party/android/skia/core/SkThread_platform.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkThread_platform.h rename to cocos2dx/platform/third_party/android/skia/core/SkThread_platform.h diff --git a/platform_support/third_party/android/skia/core/SkTime.h b/cocos2dx/platform/third_party/android/skia/core/SkTime.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkTime.h rename to cocos2dx/platform/third_party/android/skia/core/SkTime.h diff --git a/platform_support/third_party/android/skia/core/SkTypeface.h b/cocos2dx/platform/third_party/android/skia/core/SkTypeface.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkTypeface.h rename to cocos2dx/platform/third_party/android/skia/core/SkTypeface.h diff --git a/platform_support/third_party/android/skia/core/SkTypes.h b/cocos2dx/platform/third_party/android/skia/core/SkTypes.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkTypes.h rename to cocos2dx/platform/third_party/android/skia/core/SkTypes.h diff --git a/platform_support/third_party/android/skia/core/SkUnPreMultiply.h b/cocos2dx/platform/third_party/android/skia/core/SkUnPreMultiply.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkUnPreMultiply.h rename to cocos2dx/platform/third_party/android/skia/core/SkUnPreMultiply.h diff --git a/platform_support/third_party/android/skia/core/SkUnitMapper.h b/cocos2dx/platform/third_party/android/skia/core/SkUnitMapper.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkUnitMapper.h rename to cocos2dx/platform/third_party/android/skia/core/SkUnitMapper.h diff --git a/platform_support/third_party/android/skia/core/SkUserConfig.h b/cocos2dx/platform/third_party/android/skia/core/SkUserConfig.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkUserConfig.h rename to cocos2dx/platform/third_party/android/skia/core/SkUserConfig.h diff --git a/platform_support/third_party/android/skia/core/SkUtils.h b/cocos2dx/platform/third_party/android/skia/core/SkUtils.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkUtils.h rename to cocos2dx/platform/third_party/android/skia/core/SkUtils.h diff --git a/platform_support/third_party/android/skia/core/SkWriter32.h b/cocos2dx/platform/third_party/android/skia/core/SkWriter32.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkWriter32.h rename to cocos2dx/platform/third_party/android/skia/core/SkWriter32.h diff --git a/platform_support/third_party/android/skia/core/SkXfermode.h b/cocos2dx/platform/third_party/android/skia/core/SkXfermode.h similarity index 100% rename from platform_support/third_party/android/skia/core/SkXfermode.h rename to cocos2dx/platform/third_party/android/skia/core/SkXfermode.h diff --git a/platform_support/third_party/android/skia/effects/Sk1DPathEffect.h b/cocos2dx/platform/third_party/android/skia/effects/Sk1DPathEffect.h similarity index 100% rename from platform_support/third_party/android/skia/effects/Sk1DPathEffect.h rename to cocos2dx/platform/third_party/android/skia/effects/Sk1DPathEffect.h diff --git a/platform_support/third_party/android/skia/effects/Sk2DPathEffect.h b/cocos2dx/platform/third_party/android/skia/effects/Sk2DPathEffect.h similarity index 100% rename from platform_support/third_party/android/skia/effects/Sk2DPathEffect.h rename to cocos2dx/platform/third_party/android/skia/effects/Sk2DPathEffect.h diff --git a/platform_support/third_party/android/skia/effects/SkAvoidXfermode.h b/cocos2dx/platform/third_party/android/skia/effects/SkAvoidXfermode.h similarity index 100% rename from platform_support/third_party/android/skia/effects/SkAvoidXfermode.h rename to cocos2dx/platform/third_party/android/skia/effects/SkAvoidXfermode.h diff --git a/platform_support/third_party/android/skia/effects/SkBlurDrawLooper.h b/cocos2dx/platform/third_party/android/skia/effects/SkBlurDrawLooper.h similarity index 100% rename from platform_support/third_party/android/skia/effects/SkBlurDrawLooper.h rename to cocos2dx/platform/third_party/android/skia/effects/SkBlurDrawLooper.h diff --git a/platform_support/third_party/android/skia/effects/SkBlurMaskFilter.h b/cocos2dx/platform/third_party/android/skia/effects/SkBlurMaskFilter.h similarity index 100% rename from platform_support/third_party/android/skia/effects/SkBlurMaskFilter.h rename to cocos2dx/platform/third_party/android/skia/effects/SkBlurMaskFilter.h diff --git a/platform_support/third_party/android/skia/effects/SkColorMatrix.h b/cocos2dx/platform/third_party/android/skia/effects/SkColorMatrix.h similarity index 100% rename from platform_support/third_party/android/skia/effects/SkColorMatrix.h rename to cocos2dx/platform/third_party/android/skia/effects/SkColorMatrix.h diff --git a/platform_support/third_party/android/skia/effects/SkColorMatrixFilter.h b/cocos2dx/platform/third_party/android/skia/effects/SkColorMatrixFilter.h similarity index 100% rename from platform_support/third_party/android/skia/effects/SkColorMatrixFilter.h rename to cocos2dx/platform/third_party/android/skia/effects/SkColorMatrixFilter.h diff --git a/platform_support/third_party/android/skia/effects/SkCornerPathEffect.h b/cocos2dx/platform/third_party/android/skia/effects/SkCornerPathEffect.h similarity index 100% rename from platform_support/third_party/android/skia/effects/SkCornerPathEffect.h rename to cocos2dx/platform/third_party/android/skia/effects/SkCornerPathEffect.h diff --git a/platform_support/third_party/android/skia/effects/SkDashPathEffect.h b/cocos2dx/platform/third_party/android/skia/effects/SkDashPathEffect.h similarity index 100% rename from platform_support/third_party/android/skia/effects/SkDashPathEffect.h rename to cocos2dx/platform/third_party/android/skia/effects/SkDashPathEffect.h diff --git a/platform_support/third_party/android/skia/effects/SkDiscretePathEffect.h b/cocos2dx/platform/third_party/android/skia/effects/SkDiscretePathEffect.h similarity index 100% rename from platform_support/third_party/android/skia/effects/SkDiscretePathEffect.h rename to cocos2dx/platform/third_party/android/skia/effects/SkDiscretePathEffect.h diff --git a/platform_support/third_party/android/skia/effects/SkDrawExtraPathEffect.h b/cocos2dx/platform/third_party/android/skia/effects/SkDrawExtraPathEffect.h similarity index 100% rename from platform_support/third_party/android/skia/effects/SkDrawExtraPathEffect.h rename to cocos2dx/platform/third_party/android/skia/effects/SkDrawExtraPathEffect.h diff --git a/platform_support/third_party/android/skia/effects/SkEmbossMaskFilter.h b/cocos2dx/platform/third_party/android/skia/effects/SkEmbossMaskFilter.h similarity index 100% rename from platform_support/third_party/android/skia/effects/SkEmbossMaskFilter.h rename to cocos2dx/platform/third_party/android/skia/effects/SkEmbossMaskFilter.h diff --git a/platform_support/third_party/android/skia/effects/SkGradientShader.h b/cocos2dx/platform/third_party/android/skia/effects/SkGradientShader.h similarity index 100% rename from platform_support/third_party/android/skia/effects/SkGradientShader.h rename to cocos2dx/platform/third_party/android/skia/effects/SkGradientShader.h diff --git a/platform_support/third_party/android/skia/effects/SkGroupShape.h b/cocos2dx/platform/third_party/android/skia/effects/SkGroupShape.h similarity index 100% rename from platform_support/third_party/android/skia/effects/SkGroupShape.h rename to cocos2dx/platform/third_party/android/skia/effects/SkGroupShape.h diff --git a/platform_support/third_party/android/skia/effects/SkKernel33MaskFilter.h b/cocos2dx/platform/third_party/android/skia/effects/SkKernel33MaskFilter.h similarity index 100% rename from platform_support/third_party/android/skia/effects/SkKernel33MaskFilter.h rename to cocos2dx/platform/third_party/android/skia/effects/SkKernel33MaskFilter.h diff --git a/platform_support/third_party/android/skia/effects/SkLayerDrawLooper.h b/cocos2dx/platform/third_party/android/skia/effects/SkLayerDrawLooper.h similarity index 100% rename from platform_support/third_party/android/skia/effects/SkLayerDrawLooper.h rename to cocos2dx/platform/third_party/android/skia/effects/SkLayerDrawLooper.h diff --git a/platform_support/third_party/android/skia/effects/SkLayerRasterizer.h b/cocos2dx/platform/third_party/android/skia/effects/SkLayerRasterizer.h similarity index 100% rename from platform_support/third_party/android/skia/effects/SkLayerRasterizer.h rename to cocos2dx/platform/third_party/android/skia/effects/SkLayerRasterizer.h diff --git a/platform_support/third_party/android/skia/effects/SkPaintFlagsDrawFilter.h b/cocos2dx/platform/third_party/android/skia/effects/SkPaintFlagsDrawFilter.h similarity index 100% rename from platform_support/third_party/android/skia/effects/SkPaintFlagsDrawFilter.h rename to cocos2dx/platform/third_party/android/skia/effects/SkPaintFlagsDrawFilter.h diff --git a/platform_support/third_party/android/skia/effects/SkPixelXorXfermode.h b/cocos2dx/platform/third_party/android/skia/effects/SkPixelXorXfermode.h similarity index 100% rename from platform_support/third_party/android/skia/effects/SkPixelXorXfermode.h rename to cocos2dx/platform/third_party/android/skia/effects/SkPixelXorXfermode.h diff --git a/platform_support/third_party/android/skia/effects/SkPorterDuff.h b/cocos2dx/platform/third_party/android/skia/effects/SkPorterDuff.h similarity index 100% rename from platform_support/third_party/android/skia/effects/SkPorterDuff.h rename to cocos2dx/platform/third_party/android/skia/effects/SkPorterDuff.h diff --git a/platform_support/third_party/android/skia/effects/SkRectShape.h b/cocos2dx/platform/third_party/android/skia/effects/SkRectShape.h similarity index 100% rename from platform_support/third_party/android/skia/effects/SkRectShape.h rename to cocos2dx/platform/third_party/android/skia/effects/SkRectShape.h diff --git a/platform_support/third_party/android/skia/effects/SkTableMaskFilter.h b/cocos2dx/platform/third_party/android/skia/effects/SkTableMaskFilter.h similarity index 100% rename from platform_support/third_party/android/skia/effects/SkTableMaskFilter.h rename to cocos2dx/platform/third_party/android/skia/effects/SkTableMaskFilter.h diff --git a/platform_support/third_party/android/skia/effects/SkTransparentShader.h b/cocos2dx/platform/third_party/android/skia/effects/SkTransparentShader.h similarity index 100% rename from platform_support/third_party/android/skia/effects/SkTransparentShader.h rename to cocos2dx/platform/third_party/android/skia/effects/SkTransparentShader.h diff --git a/platform_support/third_party/android/skia/graphics/DoxygenMain.dox b/cocos2dx/platform/third_party/android/skia/graphics/DoxygenMain.dox similarity index 100% rename from platform_support/third_party/android/skia/graphics/DoxygenMain.dox rename to cocos2dx/platform/third_party/android/skia/graphics/DoxygenMain.dox diff --git a/platform_support/third_party/android/skia/images/SkFlipPixelRef.h b/cocos2dx/platform/third_party/android/skia/images/SkFlipPixelRef.h similarity index 100% rename from platform_support/third_party/android/skia/images/SkFlipPixelRef.h rename to cocos2dx/platform/third_party/android/skia/images/SkFlipPixelRef.h diff --git a/platform_support/third_party/android/skia/images/SkImageDecoder.h b/cocos2dx/platform/third_party/android/skia/images/SkImageDecoder.h similarity index 100% rename from platform_support/third_party/android/skia/images/SkImageDecoder.h rename to cocos2dx/platform/third_party/android/skia/images/SkImageDecoder.h diff --git a/platform_support/third_party/android/skia/images/SkImageEncoder.h b/cocos2dx/platform/third_party/android/skia/images/SkImageEncoder.h similarity index 100% rename from platform_support/third_party/android/skia/images/SkImageEncoder.h rename to cocos2dx/platform/third_party/android/skia/images/SkImageEncoder.h diff --git a/platform_support/third_party/android/skia/images/SkImageRef.h b/cocos2dx/platform/third_party/android/skia/images/SkImageRef.h similarity index 100% rename from platform_support/third_party/android/skia/images/SkImageRef.h rename to cocos2dx/platform/third_party/android/skia/images/SkImageRef.h diff --git a/platform_support/third_party/android/skia/images/SkImageRef_GlobalPool.h b/cocos2dx/platform/third_party/android/skia/images/SkImageRef_GlobalPool.h similarity index 100% rename from platform_support/third_party/android/skia/images/SkImageRef_GlobalPool.h rename to cocos2dx/platform/third_party/android/skia/images/SkImageRef_GlobalPool.h diff --git a/platform_support/third_party/android/skia/images/SkJpegUtility.h b/cocos2dx/platform/third_party/android/skia/images/SkJpegUtility.h similarity index 100% rename from platform_support/third_party/android/skia/images/SkJpegUtility.h rename to cocos2dx/platform/third_party/android/skia/images/SkJpegUtility.h diff --git a/platform_support/third_party/android/skia/images/SkMovie.h b/cocos2dx/platform/third_party/android/skia/images/SkMovie.h similarity index 100% rename from platform_support/third_party/android/skia/images/SkMovie.h rename to cocos2dx/platform/third_party/android/skia/images/SkMovie.h diff --git a/platform_support/third_party/android/skia/images/SkPageFlipper.h b/cocos2dx/platform/third_party/android/skia/images/SkPageFlipper.h similarity index 100% rename from platform_support/third_party/android/skia/images/SkPageFlipper.h rename to cocos2dx/platform/third_party/android/skia/images/SkPageFlipper.h diff --git a/platform_support/third_party/android/skia/pdf/SkPDFCatalog.h b/cocos2dx/platform/third_party/android/skia/pdf/SkPDFCatalog.h similarity index 100% rename from platform_support/third_party/android/skia/pdf/SkPDFCatalog.h rename to cocos2dx/platform/third_party/android/skia/pdf/SkPDFCatalog.h diff --git a/platform_support/third_party/android/skia/pdf/SkPDFDevice.h b/cocos2dx/platform/third_party/android/skia/pdf/SkPDFDevice.h similarity index 100% rename from platform_support/third_party/android/skia/pdf/SkPDFDevice.h rename to cocos2dx/platform/third_party/android/skia/pdf/SkPDFDevice.h diff --git a/platform_support/third_party/android/skia/pdf/SkPDFDocument.h b/cocos2dx/platform/third_party/android/skia/pdf/SkPDFDocument.h similarity index 100% rename from platform_support/third_party/android/skia/pdf/SkPDFDocument.h rename to cocos2dx/platform/third_party/android/skia/pdf/SkPDFDocument.h diff --git a/platform_support/third_party/android/skia/pdf/SkPDFFont.h b/cocos2dx/platform/third_party/android/skia/pdf/SkPDFFont.h similarity index 100% rename from platform_support/third_party/android/skia/pdf/SkPDFFont.h rename to cocos2dx/platform/third_party/android/skia/pdf/SkPDFFont.h diff --git a/platform_support/third_party/android/skia/pdf/SkPDFFormXObject.h b/cocos2dx/platform/third_party/android/skia/pdf/SkPDFFormXObject.h similarity index 100% rename from platform_support/third_party/android/skia/pdf/SkPDFFormXObject.h rename to cocos2dx/platform/third_party/android/skia/pdf/SkPDFFormXObject.h diff --git a/platform_support/third_party/android/skia/pdf/SkPDFGraphicState.h b/cocos2dx/platform/third_party/android/skia/pdf/SkPDFGraphicState.h similarity index 100% rename from platform_support/third_party/android/skia/pdf/SkPDFGraphicState.h rename to cocos2dx/platform/third_party/android/skia/pdf/SkPDFGraphicState.h diff --git a/platform_support/third_party/android/skia/pdf/SkPDFImage.h b/cocos2dx/platform/third_party/android/skia/pdf/SkPDFImage.h similarity index 100% rename from platform_support/third_party/android/skia/pdf/SkPDFImage.h rename to cocos2dx/platform/third_party/android/skia/pdf/SkPDFImage.h diff --git a/platform_support/third_party/android/skia/pdf/SkPDFPage.h b/cocos2dx/platform/third_party/android/skia/pdf/SkPDFPage.h similarity index 100% rename from platform_support/third_party/android/skia/pdf/SkPDFPage.h rename to cocos2dx/platform/third_party/android/skia/pdf/SkPDFPage.h diff --git a/platform_support/third_party/android/skia/pdf/SkPDFStream.h b/cocos2dx/platform/third_party/android/skia/pdf/SkPDFStream.h similarity index 100% rename from platform_support/third_party/android/skia/pdf/SkPDFStream.h rename to cocos2dx/platform/third_party/android/skia/pdf/SkPDFStream.h diff --git a/platform_support/third_party/android/skia/pdf/SkPDFTypes.h b/cocos2dx/platform/third_party/android/skia/pdf/SkPDFTypes.h similarity index 100% rename from platform_support/third_party/android/skia/pdf/SkPDFTypes.h rename to cocos2dx/platform/third_party/android/skia/pdf/SkPDFTypes.h diff --git a/platform_support/third_party/android/skia/ports/SkHarfBuzzFont.h b/cocos2dx/platform/third_party/android/skia/ports/SkHarfBuzzFont.h similarity index 100% rename from platform_support/third_party/android/skia/ports/SkHarfBuzzFont.h rename to cocos2dx/platform/third_party/android/skia/ports/SkHarfBuzzFont.h diff --git a/platform_support/third_party/android/skia/ports/SkStream_Win.h b/cocos2dx/platform/third_party/android/skia/ports/SkStream_Win.h similarity index 100% rename from platform_support/third_party/android/skia/ports/SkStream_Win.h rename to cocos2dx/platform/third_party/android/skia/ports/SkStream_Win.h diff --git a/platform_support/third_party/android/skia/svg/SkSVGAttribute.h b/cocos2dx/platform/third_party/android/skia/svg/SkSVGAttribute.h similarity index 100% rename from platform_support/third_party/android/skia/svg/SkSVGAttribute.h rename to cocos2dx/platform/third_party/android/skia/svg/SkSVGAttribute.h diff --git a/platform_support/third_party/android/skia/svg/SkSVGBase.h b/cocos2dx/platform/third_party/android/skia/svg/SkSVGBase.h similarity index 100% rename from platform_support/third_party/android/skia/svg/SkSVGBase.h rename to cocos2dx/platform/third_party/android/skia/svg/SkSVGBase.h diff --git a/platform_support/third_party/android/skia/svg/SkSVGPaintState.h b/cocos2dx/platform/third_party/android/skia/svg/SkSVGPaintState.h similarity index 100% rename from platform_support/third_party/android/skia/svg/SkSVGPaintState.h rename to cocos2dx/platform/third_party/android/skia/svg/SkSVGPaintState.h diff --git a/platform_support/third_party/android/skia/svg/SkSVGParser.h b/cocos2dx/platform/third_party/android/skia/svg/SkSVGParser.h similarity index 100% rename from platform_support/third_party/android/skia/svg/SkSVGParser.h rename to cocos2dx/platform/third_party/android/skia/svg/SkSVGParser.h diff --git a/platform_support/third_party/android/skia/svg/SkSVGTypes.h b/cocos2dx/platform/third_party/android/skia/svg/SkSVGTypes.h similarity index 100% rename from platform_support/third_party/android/skia/svg/SkSVGTypes.h rename to cocos2dx/platform/third_party/android/skia/svg/SkSVGTypes.h diff --git a/platform_support/third_party/android/skia/text/SkTextLayout.h b/cocos2dx/platform/third_party/android/skia/text/SkTextLayout.h similarity index 100% rename from platform_support/third_party/android/skia/text/SkTextLayout.h rename to cocos2dx/platform/third_party/android/skia/text/SkTextLayout.h diff --git a/platform_support/third_party/android/skia/utils/SkBoundaryPatch.h b/cocos2dx/platform/third_party/android/skia/utils/SkBoundaryPatch.h similarity index 100% rename from platform_support/third_party/android/skia/utils/SkBoundaryPatch.h rename to cocos2dx/platform/third_party/android/skia/utils/SkBoundaryPatch.h diff --git a/platform_support/third_party/android/skia/utils/SkCamera.h b/cocos2dx/platform/third_party/android/skia/utils/SkCamera.h similarity index 100% rename from platform_support/third_party/android/skia/utils/SkCamera.h rename to cocos2dx/platform/third_party/android/skia/utils/SkCamera.h diff --git a/platform_support/third_party/android/skia/utils/SkCubicInterval.h b/cocos2dx/platform/third_party/android/skia/utils/SkCubicInterval.h similarity index 100% rename from platform_support/third_party/android/skia/utils/SkCubicInterval.h rename to cocos2dx/platform/third_party/android/skia/utils/SkCubicInterval.h diff --git a/platform_support/third_party/android/skia/utils/SkCullPoints.h b/cocos2dx/platform/third_party/android/skia/utils/SkCullPoints.h similarity index 100% rename from platform_support/third_party/android/skia/utils/SkCullPoints.h rename to cocos2dx/platform/third_party/android/skia/utils/SkCullPoints.h diff --git a/platform_support/third_party/android/skia/utils/SkDumpCanvas.h b/cocos2dx/platform/third_party/android/skia/utils/SkDumpCanvas.h similarity index 100% rename from platform_support/third_party/android/skia/utils/SkDumpCanvas.h rename to cocos2dx/platform/third_party/android/skia/utils/SkDumpCanvas.h diff --git a/platform_support/third_party/android/skia/utils/SkGLCanvas.h b/cocos2dx/platform/third_party/android/skia/utils/SkGLCanvas.h similarity index 100% rename from platform_support/third_party/android/skia/utils/SkGLCanvas.h rename to cocos2dx/platform/third_party/android/skia/utils/SkGLCanvas.h diff --git a/platform_support/third_party/android/skia/utils/SkInterpolator.h b/cocos2dx/platform/third_party/android/skia/utils/SkInterpolator.h similarity index 100% rename from platform_support/third_party/android/skia/utils/SkInterpolator.h rename to cocos2dx/platform/third_party/android/skia/utils/SkInterpolator.h diff --git a/platform_support/third_party/android/skia/utils/SkLayer.h b/cocos2dx/platform/third_party/android/skia/utils/SkLayer.h similarity index 100% rename from platform_support/third_party/android/skia/utils/SkLayer.h rename to cocos2dx/platform/third_party/android/skia/utils/SkLayer.h diff --git a/platform_support/third_party/android/skia/utils/SkMeshUtils.h b/cocos2dx/platform/third_party/android/skia/utils/SkMeshUtils.h similarity index 100% rename from platform_support/third_party/android/skia/utils/SkMeshUtils.h rename to cocos2dx/platform/third_party/android/skia/utils/SkMeshUtils.h diff --git a/platform_support/third_party/android/skia/utils/SkNWayCanvas.h b/cocos2dx/platform/third_party/android/skia/utils/SkNWayCanvas.h similarity index 100% rename from platform_support/third_party/android/skia/utils/SkNWayCanvas.h rename to cocos2dx/platform/third_party/android/skia/utils/SkNWayCanvas.h diff --git a/platform_support/third_party/android/skia/utils/SkNinePatch.h b/cocos2dx/platform/third_party/android/skia/utils/SkNinePatch.h similarity index 100% rename from platform_support/third_party/android/skia/utils/SkNinePatch.h rename to cocos2dx/platform/third_party/android/skia/utils/SkNinePatch.h diff --git a/platform_support/third_party/android/skia/utils/SkParse.h b/cocos2dx/platform/third_party/android/skia/utils/SkParse.h similarity index 100% rename from platform_support/third_party/android/skia/utils/SkParse.h rename to cocos2dx/platform/third_party/android/skia/utils/SkParse.h diff --git a/platform_support/third_party/android/skia/utils/SkParsePaint.h b/cocos2dx/platform/third_party/android/skia/utils/SkParsePaint.h similarity index 100% rename from platform_support/third_party/android/skia/utils/SkParsePaint.h rename to cocos2dx/platform/third_party/android/skia/utils/SkParsePaint.h diff --git a/platform_support/third_party/android/skia/utils/SkParsePath.h b/cocos2dx/platform/third_party/android/skia/utils/SkParsePath.h similarity index 100% rename from platform_support/third_party/android/skia/utils/SkParsePath.h rename to cocos2dx/platform/third_party/android/skia/utils/SkParsePath.h diff --git a/platform_support/third_party/android/skia/utils/SkProxyCanvas.h b/cocos2dx/platform/third_party/android/skia/utils/SkProxyCanvas.h similarity index 100% rename from platform_support/third_party/android/skia/utils/SkProxyCanvas.h rename to cocos2dx/platform/third_party/android/skia/utils/SkProxyCanvas.h diff --git a/platform_support/third_party/android/skia/utils/SkSfntUtils.h b/cocos2dx/platform/third_party/android/skia/utils/SkSfntUtils.h similarity index 100% rename from platform_support/third_party/android/skia/utils/SkSfntUtils.h rename to cocos2dx/platform/third_party/android/skia/utils/SkSfntUtils.h diff --git a/platform_support/third_party/android/skia/utils/SkTextBox.h b/cocos2dx/platform/third_party/android/skia/utils/SkTextBox.h similarity index 100% rename from platform_support/third_party/android/skia/utils/SkTextBox.h rename to cocos2dx/platform/third_party/android/skia/utils/SkTextBox.h diff --git a/platform_support/third_party/android/skia/utils/SkTextFormatParams.h b/cocos2dx/platform/third_party/android/skia/utils/SkTextFormatParams.h similarity index 100% rename from platform_support/third_party/android/skia/utils/SkTextFormatParams.h rename to cocos2dx/platform/third_party/android/skia/utils/SkTextFormatParams.h diff --git a/platform_support/third_party/android/skia/utils/SkUnitMappers.h b/cocos2dx/platform/third_party/android/skia/utils/SkUnitMappers.h similarity index 100% rename from platform_support/third_party/android/skia/utils/SkUnitMappers.h rename to cocos2dx/platform/third_party/android/skia/utils/SkUnitMappers.h diff --git a/platform_support/third_party/android/skia/utils/mac/SkCGUtils.h b/cocos2dx/platform/third_party/android/skia/utils/mac/SkCGUtils.h similarity index 100% rename from platform_support/third_party/android/skia/utils/mac/SkCGUtils.h rename to cocos2dx/platform/third_party/android/skia/utils/mac/SkCGUtils.h diff --git a/platform_support/third_party/android/skia/views/SkApplication.h b/cocos2dx/platform/third_party/android/skia/views/SkApplication.h similarity index 100% rename from platform_support/third_party/android/skia/views/SkApplication.h rename to cocos2dx/platform/third_party/android/skia/views/SkApplication.h diff --git a/platform_support/third_party/android/skia/views/SkBGViewArtist.h b/cocos2dx/platform/third_party/android/skia/views/SkBGViewArtist.h similarity index 100% rename from platform_support/third_party/android/skia/views/SkBGViewArtist.h rename to cocos2dx/platform/third_party/android/skia/views/SkBGViewArtist.h diff --git a/platform_support/third_party/android/skia/views/SkBorderView.h b/cocos2dx/platform/third_party/android/skia/views/SkBorderView.h similarity index 100% rename from platform_support/third_party/android/skia/views/SkBorderView.h rename to cocos2dx/platform/third_party/android/skia/views/SkBorderView.h diff --git a/platform_support/third_party/android/skia/views/SkEvent.h b/cocos2dx/platform/third_party/android/skia/views/SkEvent.h similarity index 100% rename from platform_support/third_party/android/skia/views/SkEvent.h rename to cocos2dx/platform/third_party/android/skia/views/SkEvent.h diff --git a/platform_support/third_party/android/skia/views/SkEventSink.h b/cocos2dx/platform/third_party/android/skia/views/SkEventSink.h similarity index 100% rename from platform_support/third_party/android/skia/views/SkEventSink.h rename to cocos2dx/platform/third_party/android/skia/views/SkEventSink.h diff --git a/platform_support/third_party/android/skia/views/SkImageView.h b/cocos2dx/platform/third_party/android/skia/views/SkImageView.h similarity index 100% rename from platform_support/third_party/android/skia/views/SkImageView.h rename to cocos2dx/platform/third_party/android/skia/views/SkImageView.h diff --git a/platform_support/third_party/android/skia/views/SkKey.h b/cocos2dx/platform/third_party/android/skia/views/SkKey.h similarity index 100% rename from platform_support/third_party/android/skia/views/SkKey.h rename to cocos2dx/platform/third_party/android/skia/views/SkKey.h diff --git a/platform_support/third_party/android/skia/views/SkMetaData.h b/cocos2dx/platform/third_party/android/skia/views/SkMetaData.h similarity index 100% rename from platform_support/third_party/android/skia/views/SkMetaData.h rename to cocos2dx/platform/third_party/android/skia/views/SkMetaData.h diff --git a/platform_support/third_party/android/skia/views/SkOSMenu.h b/cocos2dx/platform/third_party/android/skia/views/SkOSMenu.h similarity index 100% rename from platform_support/third_party/android/skia/views/SkOSMenu.h rename to cocos2dx/platform/third_party/android/skia/views/SkOSMenu.h diff --git a/platform_support/third_party/android/skia/views/SkOSSound.h b/cocos2dx/platform/third_party/android/skia/views/SkOSSound.h similarity index 100% rename from platform_support/third_party/android/skia/views/SkOSSound.h rename to cocos2dx/platform/third_party/android/skia/views/SkOSSound.h diff --git a/platform_support/third_party/android/skia/views/SkOSWindow_Mac.h b/cocos2dx/platform/third_party/android/skia/views/SkOSWindow_Mac.h similarity index 100% rename from platform_support/third_party/android/skia/views/SkOSWindow_Mac.h rename to cocos2dx/platform/third_party/android/skia/views/SkOSWindow_Mac.h diff --git a/platform_support/third_party/android/skia/views/SkOSWindow_SDL.h b/cocos2dx/platform/third_party/android/skia/views/SkOSWindow_SDL.h similarity index 100% rename from platform_support/third_party/android/skia/views/SkOSWindow_SDL.h rename to cocos2dx/platform/third_party/android/skia/views/SkOSWindow_SDL.h diff --git a/platform_support/third_party/android/skia/views/SkOSWindow_Unix.h b/cocos2dx/platform/third_party/android/skia/views/SkOSWindow_Unix.h similarity index 100% rename from platform_support/third_party/android/skia/views/SkOSWindow_Unix.h rename to cocos2dx/platform/third_party/android/skia/views/SkOSWindow_Unix.h diff --git a/platform_support/third_party/android/skia/views/SkOSWindow_Win.h b/cocos2dx/platform/third_party/android/skia/views/SkOSWindow_Win.h similarity index 100% rename from platform_support/third_party/android/skia/views/SkOSWindow_Win.h rename to cocos2dx/platform/third_party/android/skia/views/SkOSWindow_Win.h diff --git a/platform_support/third_party/android/skia/views/SkOSWindow_wxwidgets.h b/cocos2dx/platform/third_party/android/skia/views/SkOSWindow_wxwidgets.h similarity index 100% rename from platform_support/third_party/android/skia/views/SkOSWindow_wxwidgets.h rename to cocos2dx/platform/third_party/android/skia/views/SkOSWindow_wxwidgets.h diff --git a/platform_support/third_party/android/skia/views/SkProgressBarView.h b/cocos2dx/platform/third_party/android/skia/views/SkProgressBarView.h similarity index 100% rename from platform_support/third_party/android/skia/views/SkProgressBarView.h rename to cocos2dx/platform/third_party/android/skia/views/SkProgressBarView.h diff --git a/platform_support/third_party/android/skia/views/SkScrollBarView.h b/cocos2dx/platform/third_party/android/skia/views/SkScrollBarView.h similarity index 100% rename from platform_support/third_party/android/skia/views/SkScrollBarView.h rename to cocos2dx/platform/third_party/android/skia/views/SkScrollBarView.h diff --git a/platform_support/third_party/android/skia/views/SkStackViewLayout.h b/cocos2dx/platform/third_party/android/skia/views/SkStackViewLayout.h similarity index 100% rename from platform_support/third_party/android/skia/views/SkStackViewLayout.h rename to cocos2dx/platform/third_party/android/skia/views/SkStackViewLayout.h diff --git a/platform_support/third_party/android/skia/views/SkSystemEventTypes.h b/cocos2dx/platform/third_party/android/skia/views/SkSystemEventTypes.h similarity index 100% rename from platform_support/third_party/android/skia/views/SkSystemEventTypes.h rename to cocos2dx/platform/third_party/android/skia/views/SkSystemEventTypes.h diff --git a/platform_support/third_party/android/skia/views/SkView.h b/cocos2dx/platform/third_party/android/skia/views/SkView.h similarity index 100% rename from platform_support/third_party/android/skia/views/SkView.h rename to cocos2dx/platform/third_party/android/skia/views/SkView.h diff --git a/platform_support/third_party/android/skia/views/SkViewInflate.h b/cocos2dx/platform/third_party/android/skia/views/SkViewInflate.h similarity index 100% rename from platform_support/third_party/android/skia/views/SkViewInflate.h rename to cocos2dx/platform/third_party/android/skia/views/SkViewInflate.h diff --git a/platform_support/third_party/android/skia/views/SkWidget.h b/cocos2dx/platform/third_party/android/skia/views/SkWidget.h similarity index 100% rename from platform_support/third_party/android/skia/views/SkWidget.h rename to cocos2dx/platform/third_party/android/skia/views/SkWidget.h diff --git a/platform_support/third_party/android/skia/views/SkWidgetViews.h b/cocos2dx/platform/third_party/android/skia/views/SkWidgetViews.h similarity index 100% rename from platform_support/third_party/android/skia/views/SkWidgetViews.h rename to cocos2dx/platform/third_party/android/skia/views/SkWidgetViews.h diff --git a/platform_support/third_party/android/skia/views/SkWindow.h b/cocos2dx/platform/third_party/android/skia/views/SkWindow.h similarity index 100% rename from platform_support/third_party/android/skia/views/SkWindow.h rename to cocos2dx/platform/third_party/android/skia/views/SkWindow.h diff --git a/platform_support/third_party/android/skia/xml/SkBML_WXMLParser.h b/cocos2dx/platform/third_party/android/skia/xml/SkBML_WXMLParser.h similarity index 100% rename from platform_support/third_party/android/skia/xml/SkBML_WXMLParser.h rename to cocos2dx/platform/third_party/android/skia/xml/SkBML_WXMLParser.h diff --git a/platform_support/third_party/android/skia/xml/SkBML_XMLParser.h b/cocos2dx/platform/third_party/android/skia/xml/SkBML_XMLParser.h similarity index 100% rename from platform_support/third_party/android/skia/xml/SkBML_XMLParser.h rename to cocos2dx/platform/third_party/android/skia/xml/SkBML_XMLParser.h diff --git a/platform_support/third_party/android/skia/xml/SkDOM.h b/cocos2dx/platform/third_party/android/skia/xml/SkDOM.h similarity index 100% rename from platform_support/third_party/android/skia/xml/SkDOM.h rename to cocos2dx/platform/third_party/android/skia/xml/SkDOM.h diff --git a/platform_support/third_party/android/skia/xml/SkJS.h b/cocos2dx/platform/third_party/android/skia/xml/SkJS.h similarity index 100% rename from platform_support/third_party/android/skia/xml/SkJS.h rename to cocos2dx/platform/third_party/android/skia/xml/SkJS.h diff --git a/platform_support/third_party/android/skia/xml/SkXMLParser.h b/cocos2dx/platform/third_party/android/skia/xml/SkXMLParser.h similarity index 100% rename from platform_support/third_party/android/skia/xml/SkXMLParser.h rename to cocos2dx/platform/third_party/android/skia/xml/SkXMLParser.h diff --git a/platform_support/third_party/android/skia/xml/SkXMLWriter.h b/cocos2dx/platform/third_party/android/skia/xml/SkXMLWriter.h similarity index 100% rename from platform_support/third_party/android/skia/xml/SkXMLWriter.h rename to cocos2dx/platform/third_party/android/skia/xml/SkXMLWriter.h diff --git a/platform_support/third_party/win32/OGLES/EGL/egl.h b/cocos2dx/platform/third_party/win32/OGLES/EGL/egl.h similarity index 100% rename from platform_support/third_party/win32/OGLES/EGL/egl.h rename to cocos2dx/platform/third_party/win32/OGLES/EGL/egl.h diff --git a/platform_support/third_party/win32/OGLES/EGL/eglext.h b/cocos2dx/platform/third_party/win32/OGLES/EGL/eglext.h similarity index 100% rename from platform_support/third_party/win32/OGLES/EGL/eglext.h rename to cocos2dx/platform/third_party/win32/OGLES/EGL/eglext.h diff --git a/platform_support/third_party/win32/OGLES/EGL/eglplatform.h b/cocos2dx/platform/third_party/win32/OGLES/EGL/eglplatform.h similarity index 100% rename from platform_support/third_party/win32/OGLES/EGL/eglplatform.h rename to cocos2dx/platform/third_party/win32/OGLES/EGL/eglplatform.h diff --git a/platform_support/third_party/win32/OGLES/GLES/egl.h b/cocos2dx/platform/third_party/win32/OGLES/GLES/egl.h similarity index 100% rename from platform_support/third_party/win32/OGLES/GLES/egl.h rename to cocos2dx/platform/third_party/win32/OGLES/GLES/egl.h diff --git a/platform_support/third_party/win32/OGLES/GLES/gl.h b/cocos2dx/platform/third_party/win32/OGLES/GLES/gl.h similarity index 100% rename from platform_support/third_party/win32/OGLES/GLES/gl.h rename to cocos2dx/platform/third_party/win32/OGLES/GLES/gl.h diff --git a/platform_support/third_party/win32/OGLES/GLES/glext.h b/cocos2dx/platform/third_party/win32/OGLES/GLES/glext.h similarity index 100% rename from platform_support/third_party/win32/OGLES/GLES/glext.h rename to cocos2dx/platform/third_party/win32/OGLES/GLES/glext.h diff --git a/platform_support/third_party/win32/OGLES/GLES/glplatform.h b/cocos2dx/platform/third_party/win32/OGLES/GLES/glplatform.h similarity index 100% rename from platform_support/third_party/win32/OGLES/GLES/glplatform.h rename to cocos2dx/platform/third_party/win32/OGLES/GLES/glplatform.h diff --git a/platform_support/third_party/win32/OGLES/KHR/khrplatform.h b/cocos2dx/platform/third_party/win32/OGLES/KHR/khrplatform.h similarity index 100% rename from platform_support/third_party/win32/OGLES/KHR/khrplatform.h rename to cocos2dx/platform/third_party/win32/OGLES/KHR/khrplatform.h diff --git a/platform_support/third_party/win32/iconv/iconv.h b/cocos2dx/platform/third_party/win32/iconv/iconv.h similarity index 100% rename from platform_support/third_party/win32/iconv/iconv.h rename to cocos2dx/platform/third_party/win32/iconv/iconv.h diff --git a/platform_support/third_party/win32/libjpeg/jconfig.h b/cocos2dx/platform/third_party/win32/libjpeg/jconfig.h similarity index 100% rename from platform_support/third_party/win32/libjpeg/jconfig.h rename to cocos2dx/platform/third_party/win32/libjpeg/jconfig.h diff --git a/platform_support/third_party/win32/libjpeg/jconfig_linux.h b/cocos2dx/platform/third_party/win32/libjpeg/jconfig_linux.h similarity index 100% rename from platform_support/third_party/win32/libjpeg/jconfig_linux.h rename to cocos2dx/platform/third_party/win32/libjpeg/jconfig_linux.h diff --git a/platform_support/third_party/win32/libjpeg/jconfig_win.h b/cocos2dx/platform/third_party/win32/libjpeg/jconfig_win.h similarity index 100% rename from platform_support/third_party/win32/libjpeg/jconfig_win.h rename to cocos2dx/platform/third_party/win32/libjpeg/jconfig_win.h diff --git a/platform_support/third_party/win32/libjpeg/jerror.h b/cocos2dx/platform/third_party/win32/libjpeg/jerror.h similarity index 100% rename from platform_support/third_party/win32/libjpeg/jerror.h rename to cocos2dx/platform/third_party/win32/libjpeg/jerror.h diff --git a/platform_support/third_party/win32/libjpeg/jmorecfg.h b/cocos2dx/platform/third_party/win32/libjpeg/jmorecfg.h similarity index 100% rename from platform_support/third_party/win32/libjpeg/jmorecfg.h rename to cocos2dx/platform/third_party/win32/libjpeg/jmorecfg.h diff --git a/platform_support/third_party/win32/libjpeg/jpeglib.h b/cocos2dx/platform/third_party/win32/libjpeg/jpeglib.h similarity index 100% rename from platform_support/third_party/win32/libjpeg/jpeglib.h rename to cocos2dx/platform/third_party/win32/libjpeg/jpeglib.h diff --git a/platform_support/third_party/win32/libpng/png.h.REMOVED.git-id b/cocos2dx/platform/third_party/win32/libpng/png.h.REMOVED.git-id similarity index 100% rename from platform_support/third_party/win32/libpng/png.h.REMOVED.git-id rename to cocos2dx/platform/third_party/win32/libpng/png.h.REMOVED.git-id diff --git a/platform_support/third_party/win32/libpng/pngconf.h b/cocos2dx/platform/third_party/win32/libpng/pngconf.h similarity index 100% rename from platform_support/third_party/win32/libpng/pngconf.h rename to cocos2dx/platform/third_party/win32/libpng/pngconf.h diff --git a/platform_support/third_party/win32/libraries/iconv.dll.REMOVED.git-id b/cocos2dx/platform/third_party/win32/libraries/iconv.dll.REMOVED.git-id similarity index 100% rename from platform_support/third_party/win32/libraries/iconv.dll.REMOVED.git-id rename to cocos2dx/platform/third_party/win32/libraries/iconv.dll.REMOVED.git-id diff --git a/platform_support/third_party/win32/libraries/libEGL.dll.REMOVED.git-id b/cocos2dx/platform/third_party/win32/libraries/libEGL.dll.REMOVED.git-id similarity index 100% rename from platform_support/third_party/win32/libraries/libEGL.dll.REMOVED.git-id rename to cocos2dx/platform/third_party/win32/libraries/libEGL.dll.REMOVED.git-id diff --git a/platform_support/third_party/win32/libraries/libgles_cm.dll.REMOVED.git-id b/cocos2dx/platform/third_party/win32/libraries/libgles_cm.dll.REMOVED.git-id similarity index 100% rename from platform_support/third_party/win32/libraries/libgles_cm.dll.REMOVED.git-id rename to cocos2dx/platform/third_party/win32/libraries/libgles_cm.dll.REMOVED.git-id diff --git a/platform_support/third_party/win32/libraries/libjpeg.lib.REMOVED.git-id b/cocos2dx/platform/third_party/win32/libraries/libjpeg.lib.REMOVED.git-id similarity index 100% rename from platform_support/third_party/win32/libraries/libjpeg.lib.REMOVED.git-id rename to cocos2dx/platform/third_party/win32/libraries/libjpeg.lib.REMOVED.git-id diff --git a/platform_support/third_party/win32/libraries/libpng.lib.REMOVED.git-id b/cocos2dx/platform/third_party/win32/libraries/libpng.lib.REMOVED.git-id similarity index 100% rename from platform_support/third_party/win32/libraries/libpng.lib.REMOVED.git-id rename to cocos2dx/platform/third_party/win32/libraries/libpng.lib.REMOVED.git-id diff --git a/platform_support/third_party/win32/libraries/libxml2.dll.REMOVED.git-id b/cocos2dx/platform/third_party/win32/libraries/libxml2.dll.REMOVED.git-id similarity index 100% rename from platform_support/third_party/win32/libraries/libxml2.dll.REMOVED.git-id rename to cocos2dx/platform/third_party/win32/libraries/libxml2.dll.REMOVED.git-id diff --git a/platform_support/third_party/win32/libraries/libxml2.lib.REMOVED.git-id b/cocos2dx/platform/third_party/win32/libraries/libxml2.lib.REMOVED.git-id similarity index 100% rename from platform_support/third_party/win32/libraries/libxml2.lib.REMOVED.git-id rename to cocos2dx/platform/third_party/win32/libraries/libxml2.lib.REMOVED.git-id diff --git a/platform_support/third_party/win32/libxml2/libxml/DOCBparser.h b/cocos2dx/platform/third_party/win32/libxml2/libxml/DOCBparser.h similarity index 100% rename from platform_support/third_party/win32/libxml2/libxml/DOCBparser.h rename to cocos2dx/platform/third_party/win32/libxml2/libxml/DOCBparser.h diff --git a/platform_support/third_party/win32/libxml2/libxml/HTMLparser.h b/cocos2dx/platform/third_party/win32/libxml2/libxml/HTMLparser.h similarity index 100% rename from platform_support/third_party/win32/libxml2/libxml/HTMLparser.h rename to cocos2dx/platform/third_party/win32/libxml2/libxml/HTMLparser.h diff --git a/platform_support/third_party/win32/libxml2/libxml/HTMLtree.h b/cocos2dx/platform/third_party/win32/libxml2/libxml/HTMLtree.h similarity index 100% rename from platform_support/third_party/win32/libxml2/libxml/HTMLtree.h rename to cocos2dx/platform/third_party/win32/libxml2/libxml/HTMLtree.h diff --git a/platform_support/third_party/win32/libxml2/libxml/SAX.h b/cocos2dx/platform/third_party/win32/libxml2/libxml/SAX.h similarity index 100% rename from platform_support/third_party/win32/libxml2/libxml/SAX.h rename to cocos2dx/platform/third_party/win32/libxml2/libxml/SAX.h diff --git a/platform_support/third_party/win32/libxml2/libxml/SAX2.h b/cocos2dx/platform/third_party/win32/libxml2/libxml/SAX2.h similarity index 100% rename from platform_support/third_party/win32/libxml2/libxml/SAX2.h rename to cocos2dx/platform/third_party/win32/libxml2/libxml/SAX2.h diff --git a/platform_support/third_party/win32/libxml2/libxml/c14n.h b/cocos2dx/platform/third_party/win32/libxml2/libxml/c14n.h similarity index 100% rename from platform_support/third_party/win32/libxml2/libxml/c14n.h rename to cocos2dx/platform/third_party/win32/libxml2/libxml/c14n.h diff --git a/platform_support/third_party/win32/libxml2/libxml/catalog.h b/cocos2dx/platform/third_party/win32/libxml2/libxml/catalog.h similarity index 100% rename from platform_support/third_party/win32/libxml2/libxml/catalog.h rename to cocos2dx/platform/third_party/win32/libxml2/libxml/catalog.h diff --git a/platform_support/third_party/win32/libxml2/libxml/chvalid.h b/cocos2dx/platform/third_party/win32/libxml2/libxml/chvalid.h similarity index 100% rename from platform_support/third_party/win32/libxml2/libxml/chvalid.h rename to cocos2dx/platform/third_party/win32/libxml2/libxml/chvalid.h diff --git a/platform_support/third_party/win32/libxml2/libxml/debugXML.h b/cocos2dx/platform/third_party/win32/libxml2/libxml/debugXML.h similarity index 100% rename from platform_support/third_party/win32/libxml2/libxml/debugXML.h rename to cocos2dx/platform/third_party/win32/libxml2/libxml/debugXML.h diff --git a/platform_support/third_party/win32/libxml2/libxml/dict.h b/cocos2dx/platform/third_party/win32/libxml2/libxml/dict.h similarity index 100% rename from platform_support/third_party/win32/libxml2/libxml/dict.h rename to cocos2dx/platform/third_party/win32/libxml2/libxml/dict.h diff --git a/platform_support/third_party/win32/libxml2/libxml/encoding.h b/cocos2dx/platform/third_party/win32/libxml2/libxml/encoding.h similarity index 100% rename from platform_support/third_party/win32/libxml2/libxml/encoding.h rename to cocos2dx/platform/third_party/win32/libxml2/libxml/encoding.h diff --git a/platform_support/third_party/win32/libxml2/libxml/entities.h b/cocos2dx/platform/third_party/win32/libxml2/libxml/entities.h similarity index 100% rename from platform_support/third_party/win32/libxml2/libxml/entities.h rename to cocos2dx/platform/third_party/win32/libxml2/libxml/entities.h diff --git a/platform_support/third_party/win32/libxml2/libxml/globals.h b/cocos2dx/platform/third_party/win32/libxml2/libxml/globals.h similarity index 100% rename from platform_support/third_party/win32/libxml2/libxml/globals.h rename to cocos2dx/platform/third_party/win32/libxml2/libxml/globals.h diff --git a/platform_support/third_party/win32/libxml2/libxml/hash.h b/cocos2dx/platform/third_party/win32/libxml2/libxml/hash.h similarity index 100% rename from platform_support/third_party/win32/libxml2/libxml/hash.h rename to cocos2dx/platform/third_party/win32/libxml2/libxml/hash.h diff --git a/platform_support/third_party/win32/libxml2/libxml/list.h b/cocos2dx/platform/third_party/win32/libxml2/libxml/list.h similarity index 100% rename from platform_support/third_party/win32/libxml2/libxml/list.h rename to cocos2dx/platform/third_party/win32/libxml2/libxml/list.h diff --git a/platform_support/third_party/win32/libxml2/libxml/nanoftp.h b/cocos2dx/platform/third_party/win32/libxml2/libxml/nanoftp.h similarity index 100% rename from platform_support/third_party/win32/libxml2/libxml/nanoftp.h rename to cocos2dx/platform/third_party/win32/libxml2/libxml/nanoftp.h diff --git a/platform_support/third_party/win32/libxml2/libxml/nanohttp.h b/cocos2dx/platform/third_party/win32/libxml2/libxml/nanohttp.h similarity index 100% rename from platform_support/third_party/win32/libxml2/libxml/nanohttp.h rename to cocos2dx/platform/third_party/win32/libxml2/libxml/nanohttp.h diff --git a/platform_support/third_party/win32/libxml2/libxml/parser.h b/cocos2dx/platform/third_party/win32/libxml2/libxml/parser.h similarity index 100% rename from platform_support/third_party/win32/libxml2/libxml/parser.h rename to cocos2dx/platform/third_party/win32/libxml2/libxml/parser.h diff --git a/platform_support/third_party/win32/libxml2/libxml/parserInternals.h b/cocos2dx/platform/third_party/win32/libxml2/libxml/parserInternals.h similarity index 100% rename from platform_support/third_party/win32/libxml2/libxml/parserInternals.h rename to cocos2dx/platform/third_party/win32/libxml2/libxml/parserInternals.h diff --git a/platform_support/third_party/win32/libxml2/libxml/pattern.h b/cocos2dx/platform/third_party/win32/libxml2/libxml/pattern.h similarity index 100% rename from platform_support/third_party/win32/libxml2/libxml/pattern.h rename to cocos2dx/platform/third_party/win32/libxml2/libxml/pattern.h diff --git a/platform_support/third_party/win32/libxml2/libxml/relaxng.h b/cocos2dx/platform/third_party/win32/libxml2/libxml/relaxng.h similarity index 100% rename from platform_support/third_party/win32/libxml2/libxml/relaxng.h rename to cocos2dx/platform/third_party/win32/libxml2/libxml/relaxng.h diff --git a/platform_support/third_party/win32/libxml2/libxml/schemasInternals.h b/cocos2dx/platform/third_party/win32/libxml2/libxml/schemasInternals.h similarity index 100% rename from platform_support/third_party/win32/libxml2/libxml/schemasInternals.h rename to cocos2dx/platform/third_party/win32/libxml2/libxml/schemasInternals.h diff --git a/platform_support/third_party/win32/libxml2/libxml/schematron.h b/cocos2dx/platform/third_party/win32/libxml2/libxml/schematron.h similarity index 100% rename from platform_support/third_party/win32/libxml2/libxml/schematron.h rename to cocos2dx/platform/third_party/win32/libxml2/libxml/schematron.h diff --git a/platform_support/third_party/win32/libxml2/libxml/threads.h b/cocos2dx/platform/third_party/win32/libxml2/libxml/threads.h similarity index 100% rename from platform_support/third_party/win32/libxml2/libxml/threads.h rename to cocos2dx/platform/third_party/win32/libxml2/libxml/threads.h diff --git a/platform_support/third_party/win32/libxml2/libxml/tree.h b/cocos2dx/platform/third_party/win32/libxml2/libxml/tree.h similarity index 100% rename from platform_support/third_party/win32/libxml2/libxml/tree.h rename to cocos2dx/platform/third_party/win32/libxml2/libxml/tree.h diff --git a/platform_support/third_party/win32/libxml2/libxml/uri.h b/cocos2dx/platform/third_party/win32/libxml2/libxml/uri.h similarity index 100% rename from platform_support/third_party/win32/libxml2/libxml/uri.h rename to cocos2dx/platform/third_party/win32/libxml2/libxml/uri.h diff --git a/platform_support/third_party/win32/libxml2/libxml/valid.h b/cocos2dx/platform/third_party/win32/libxml2/libxml/valid.h similarity index 100% rename from platform_support/third_party/win32/libxml2/libxml/valid.h rename to cocos2dx/platform/third_party/win32/libxml2/libxml/valid.h diff --git a/platform_support/third_party/win32/libxml2/libxml/xinclude.h b/cocos2dx/platform/third_party/win32/libxml2/libxml/xinclude.h similarity index 100% rename from platform_support/third_party/win32/libxml2/libxml/xinclude.h rename to cocos2dx/platform/third_party/win32/libxml2/libxml/xinclude.h diff --git a/platform_support/third_party/win32/libxml2/libxml/xlink.h b/cocos2dx/platform/third_party/win32/libxml2/libxml/xlink.h similarity index 100% rename from platform_support/third_party/win32/libxml2/libxml/xlink.h rename to cocos2dx/platform/third_party/win32/libxml2/libxml/xlink.h diff --git a/platform_support/third_party/win32/libxml2/libxml/xmlIO.h b/cocos2dx/platform/third_party/win32/libxml2/libxml/xmlIO.h similarity index 100% rename from platform_support/third_party/win32/libxml2/libxml/xmlIO.h rename to cocos2dx/platform/third_party/win32/libxml2/libxml/xmlIO.h diff --git a/platform_support/third_party/win32/libxml2/libxml/xmlautomata.h b/cocos2dx/platform/third_party/win32/libxml2/libxml/xmlautomata.h similarity index 100% rename from platform_support/third_party/win32/libxml2/libxml/xmlautomata.h rename to cocos2dx/platform/third_party/win32/libxml2/libxml/xmlautomata.h diff --git a/platform_support/third_party/win32/libxml2/libxml/xmlerror.h b/cocos2dx/platform/third_party/win32/libxml2/libxml/xmlerror.h similarity index 100% rename from platform_support/third_party/win32/libxml2/libxml/xmlerror.h rename to cocos2dx/platform/third_party/win32/libxml2/libxml/xmlerror.h diff --git a/platform_support/third_party/win32/libxml2/libxml/xmlexports.h b/cocos2dx/platform/third_party/win32/libxml2/libxml/xmlexports.h similarity index 100% rename from platform_support/third_party/win32/libxml2/libxml/xmlexports.h rename to cocos2dx/platform/third_party/win32/libxml2/libxml/xmlexports.h diff --git a/platform_support/third_party/win32/libxml2/libxml/xmlmemory.h b/cocos2dx/platform/third_party/win32/libxml2/libxml/xmlmemory.h similarity index 100% rename from platform_support/third_party/win32/libxml2/libxml/xmlmemory.h rename to cocos2dx/platform/third_party/win32/libxml2/libxml/xmlmemory.h diff --git a/platform_support/third_party/win32/libxml2/libxml/xmlmodule.h b/cocos2dx/platform/third_party/win32/libxml2/libxml/xmlmodule.h similarity index 100% rename from platform_support/third_party/win32/libxml2/libxml/xmlmodule.h rename to cocos2dx/platform/third_party/win32/libxml2/libxml/xmlmodule.h diff --git a/platform_support/third_party/win32/libxml2/libxml/xmlreader.h b/cocos2dx/platform/third_party/win32/libxml2/libxml/xmlreader.h similarity index 100% rename from platform_support/third_party/win32/libxml2/libxml/xmlreader.h rename to cocos2dx/platform/third_party/win32/libxml2/libxml/xmlreader.h diff --git a/platform_support/third_party/win32/libxml2/libxml/xmlregexp.h b/cocos2dx/platform/third_party/win32/libxml2/libxml/xmlregexp.h similarity index 100% rename from platform_support/third_party/win32/libxml2/libxml/xmlregexp.h rename to cocos2dx/platform/third_party/win32/libxml2/libxml/xmlregexp.h diff --git a/platform_support/third_party/win32/libxml2/libxml/xmlsave.h b/cocos2dx/platform/third_party/win32/libxml2/libxml/xmlsave.h similarity index 100% rename from platform_support/third_party/win32/libxml2/libxml/xmlsave.h rename to cocos2dx/platform/third_party/win32/libxml2/libxml/xmlsave.h diff --git a/platform_support/third_party/win32/libxml2/libxml/xmlschemas.h b/cocos2dx/platform/third_party/win32/libxml2/libxml/xmlschemas.h similarity index 100% rename from platform_support/third_party/win32/libxml2/libxml/xmlschemas.h rename to cocos2dx/platform/third_party/win32/libxml2/libxml/xmlschemas.h diff --git a/platform_support/third_party/win32/libxml2/libxml/xmlschemastypes.h b/cocos2dx/platform/third_party/win32/libxml2/libxml/xmlschemastypes.h similarity index 100% rename from platform_support/third_party/win32/libxml2/libxml/xmlschemastypes.h rename to cocos2dx/platform/third_party/win32/libxml2/libxml/xmlschemastypes.h diff --git a/platform_support/third_party/win32/libxml2/libxml/xmlstring.h b/cocos2dx/platform/third_party/win32/libxml2/libxml/xmlstring.h similarity index 100% rename from platform_support/third_party/win32/libxml2/libxml/xmlstring.h rename to cocos2dx/platform/third_party/win32/libxml2/libxml/xmlstring.h diff --git a/platform_support/third_party/win32/libxml2/libxml/xmlunicode.h b/cocos2dx/platform/third_party/win32/libxml2/libxml/xmlunicode.h similarity index 100% rename from platform_support/third_party/win32/libxml2/libxml/xmlunicode.h rename to cocos2dx/platform/third_party/win32/libxml2/libxml/xmlunicode.h diff --git a/platform_support/third_party/win32/libxml2/libxml/xmlversion.h b/cocos2dx/platform/third_party/win32/libxml2/libxml/xmlversion.h similarity index 100% rename from platform_support/third_party/win32/libxml2/libxml/xmlversion.h rename to cocos2dx/platform/third_party/win32/libxml2/libxml/xmlversion.h diff --git a/platform_support/third_party/win32/libxml2/libxml/xmlwriter.h b/cocos2dx/platform/third_party/win32/libxml2/libxml/xmlwriter.h similarity index 100% rename from platform_support/third_party/win32/libxml2/libxml/xmlwriter.h rename to cocos2dx/platform/third_party/win32/libxml2/libxml/xmlwriter.h diff --git a/platform_support/third_party/win32/libxml2/libxml/xpath.h b/cocos2dx/platform/third_party/win32/libxml2/libxml/xpath.h similarity index 100% rename from platform_support/third_party/win32/libxml2/libxml/xpath.h rename to cocos2dx/platform/third_party/win32/libxml2/libxml/xpath.h diff --git a/platform_support/third_party/win32/libxml2/libxml/xpathInternals.h b/cocos2dx/platform/third_party/win32/libxml2/libxml/xpathInternals.h similarity index 100% rename from platform_support/third_party/win32/libxml2/libxml/xpathInternals.h rename to cocos2dx/platform/third_party/win32/libxml2/libxml/xpathInternals.h diff --git a/platform_support/third_party/win32/libxml2/libxml/xpointer.h b/cocos2dx/platform/third_party/win32/libxml2/libxml/xpointer.h similarity index 100% rename from platform_support/third_party/win32/libxml2/libxml/xpointer.h rename to cocos2dx/platform/third_party/win32/libxml2/libxml/xpointer.h diff --git a/platform_support/third_party/win32/third_party_versions.txt b/cocos2dx/platform/third_party/win32/third_party_versions.txt similarity index 100% rename from platform_support/third_party/win32/third_party_versions.txt rename to cocos2dx/platform/third_party/win32/third_party_versions.txt diff --git a/platform_support/third_party/win32/zlib/zconf.h b/cocos2dx/platform/third_party/win32/zlib/zconf.h similarity index 100% rename from platform_support/third_party/win32/zlib/zconf.h rename to cocos2dx/platform/third_party/win32/zlib/zconf.h diff --git a/platform_support/third_party/win32/zlib/zlib.h b/cocos2dx/platform/third_party/win32/zlib/zlib.h similarity index 100% rename from platform_support/third_party/win32/zlib/zlib.h rename to cocos2dx/platform/third_party/win32/zlib/zlib.h diff --git a/platform_support/src/uphone/CCImage_uphone.cpp b/cocos2dx/platform/uphone/CCImage_uphone.cpp similarity index 100% rename from platform_support/src/uphone/CCImage_uphone.cpp rename to cocos2dx/platform/uphone/CCImage_uphone.cpp diff --git a/platform_support/src/uphone/CCThread_uphone.cpp b/cocos2dx/platform/uphone/CCThread_uphone.cpp similarity index 100% rename from platform_support/src/uphone/CCThread_uphone.cpp rename to cocos2dx/platform/uphone/CCThread_uphone.cpp diff --git a/platform_support/src/win32/ccimage_win32.cpp b/cocos2dx/platform/win32/CCImage_win32.cpp similarity index 100% rename from platform_support/src/win32/ccimage_win32.cpp rename to cocos2dx/platform/win32/CCImage_win32.cpp diff --git a/platform_support/src/win32/CCThread_win32.cpp b/cocos2dx/platform/win32/CCThread_win32.cpp similarity index 100% rename from platform_support/src/win32/CCThread_win32.cpp rename to cocos2dx/platform/win32/CCThread_win32.cpp diff --git a/cocos2dx/proj.win32/cocos2d-win32.vcproj b/cocos2dx/proj.win32/cocos2d-win32.vcproj index b9519b460d..57ad2a0505 100644 --- a/cocos2dx/proj.win32/cocos2d-win32.vcproj +++ b/cocos2dx/proj.win32/cocos2d-win32.vcproj @@ -41,7 +41,7 @@ + + + + @@ -730,6 +738,10 @@ RelativePath="..\platform\CCFileUtils_platform.h" > + + @@ -738,10 +750,22 @@ RelativePath="..\platform\CCGrid_mobile.cpp" > + + + + + + @@ -766,14 +790,38 @@ RelativePath="..\platform\CCParticleSystemPoint_platform.h" > + + + + + + + + + + + + diff --git a/platform_support/README.txt b/platform_support/README.txt deleted file mode 100644 index e5c95d5482..0000000000 --- a/platform_support/README.txt +++ /dev/null @@ -1,13 +0,0 @@ -1. Introduction - - Deal with difference of C std library, C++ std library, libxml2 and other 3rd-party libraries among each platform. - Provide some functions which cocos2d-x used. - -2. Release Note - - a. Rename CCX_PLATFORM_IPHONE to CCX_PLATFORM_IOS - -3. Todo - - a. Remove macro CCX_PLATFORM_MOBILE and CCX_PLATFORM_PC - diff --git a/platform_support/include/CCPlatformMacros.h b/platform_support/include/CCPlatformMacros.h deleted file mode 100644 index feefd27749..0000000000 --- a/platform_support/include/CCPlatformMacros.h +++ /dev/null @@ -1,153 +0,0 @@ -/**************************************************************************** -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. -****************************************************************************/ - -#ifndef __CC_MACROS_H_YANGWS_20110111__ -#define __CC_MACROS_H_YANGWS_20110111__ - -#include "CCPlatformConfig.h" - -// generic macros - -// namespace cocos2d {} -#define NS_CC_BEGIN namespace cocos2d { -#define NS_CC_END } -#define USING_NS_CC using namespace cocos2d - -/** CC_PROPERTY_READONLY is used to declare a protected variable. - We can use getter to read the variable. - @param varType : the type of variable. - @param varName : variable name. - @param funName : "get + funName" is the name of the getter. - @warning : The getter is a public virtual function, you should rewrite it first. - The variables and methods declared after CC_PROPERTY_READONLY are all public. - If you need protected or private, please declare. - */ -#define CC_PROPERTY_READONLY(varType, varName, funName)\ -protected: varType varName;\ -public: virtual varType get##funName(void); - -/** CC_PROPERTY is used to declare a protected variable. - We can use getter to read the variable, and use the setter to change the variable. - @param varType : the type of variable. - @param varName : variable name. - @param funName : "get + funName" is the name of the getter. - "set + funName" is the name of the setter. - @warning : The getter and setter are public virtual functions, you should rewrite them first. - The variables and methods declared after CC_PROPERTY are all public. - If you need protected or private, please declare. - */ -#define CC_PROPERTY(varType, varName, funName)\ -protected: varType varName;\ -public: virtual varType get##funName(void);\ -public: virtual void set##funName(varType var); - -/** CC_SYNTHESIZE_READONLY is used to declare a protected variable. - We can use getter to read the variable. - @param varType : the type of variable. - @param varName : variable name. - @param funName : "get + funName" is the name of the getter. - @warning : The getter is a public inline function. - The variables and methods declared after CC_SYNTHESIZE_READONLY are all public. - If you need protected or private, please declare. - */ -#define CC_SYNTHESIZE_READONLY(varType, varName, funName)\ -protected: varType varName;\ -public: inline varType get##funName(void) const { return varName; } - -/** CC_SYNTHESIZE is used to declare a protected variable. - We can use getter to read the variable, and use the setter to change the variable. - @param varType : the type of variable. - @param varName : variable name. - @param funName : "get + funName" is the name of the getter. - "set + funName" is the name of the setter. - @warning : The getter and setter are public inline functions. - The variables and methods declared after CC_SYNTHESIZE are all public. - If you need protected or private, please declare. - */ -#define CC_SYNTHESIZE(varType, varName, funName)\ -protected: varType varName;\ -public: inline varType get##funName(void) const { return varName; }\ -public: inline void set##funName(varType var){ varName = var; } - -#define CC_SAFE_DELETE(p) if(p) { delete p; p = 0; } -#define CC_SAFE_DELETE_ARRAY(p) if(p) { delete[] p; p = 0; } -#define CC_SAFE_FREE(p) if(p) { free(p); p = 0; } -#define CC_SAFE_RELEASE(p) if(p) { p->release(); } -#define CC_SAFE_RELEASE_NULL(p) if(p) { p->release(); p = 0; } -#define CC_SAFE_RETAIN(p) if(p) { p->retain(); } -#define CC_BREAK_IF(cond) if(cond) break; - - -// cocos2d debug -#if !defined(COCOS2D_DEBUG) || COCOS2D_DEBUG == 0 -#define CCLOG(...) do {} while (0) -#define CCLOGINFO(...) do {} while (0) -#define CCLOGERROR(...) do {} while (0) - -#elif COCOS2D_DEBUG == 1 -#define CCLOG(format, ...) cocos2d::CCLog(format, ##__VA_ARGS__) -#define CCLOGERROR(format,...) cocos2d::CCLog(format, ##__VA_ARGS__) -#define CCLOGINFO(format,...) do {} while (0) - -#elif COCOS2D_DEBUG > 1 -#define CCLOG(format, ...) cocos2d::CCLog(format, ##__VA_ARGS__) -#define CCLOGERROR(format,...) cocos2d::CCLog(format, ##__VA_ARGS__) -#define CCLOGINFO(format,...) cocos2d::CCLog(format, ##__VA_ARGS__) -#endif // COCOS2D_DEBUG - -// shared library declartor -#define CC_DLL - -// assertion -#include -#define CC_ASSERT(cond) assert(cond) - -// platform depended macros - -#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) - - #undef CC_DLL - #if defined(_USRDLL) - #define CC_DLL __declspec(dllexport) - #else /* use a DLL library */ - #define CC_DLL __declspec(dllimport) - #endif - -#endif // CC_PLATFORM_WIN32 - -#if (CC_TARGET_PLATFORM == CC_PLATFORM_UPHONE && defined(_TRANZDA_VM_)) - - #undef CC_DLL - #if defined(SS_MAKEDLL) - #define CC_DLL __declspec(dllexport) - #else /* use a DLL library */ - #define CC_DLL __declspec(dllimport) - #endif - -#endif // uphone VM - -// shared library declator for platform_support project -#define CC_DLL_PS CC_DLL - -#endif // __CC_MACROS_H_YANGWS_20110111__ diff --git a/platform_support/include/ccxGL.h b/platform_support/include/ccxGL.h deleted file mode 100644 index 92263d7662..0000000000 --- a/platform_support/include/ccxGL.h +++ /dev/null @@ -1,75 +0,0 @@ -/**************************************************************************** -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. -****************************************************************************/ - -#ifndef __CC_GL_H__ -#define __CC_GL_H__ - -#include "CCCommon.h" - -#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) -#include "OpenGLES/ES1/gl.h" -#include "OpenGLES/ES1/glext.h" -#endif - -#if (CC_TARGET_PLATFORM == CC_PLATFORM_MAC) -#include -#include -#endif - -#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) -#include -#include -#endif - -#if (CC_TARGET_PLATFORM == CC_PLATFORM_UPHONE) -#include -#include -#endif - -#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) -#include -#include -#endif - -#if defined(CC_PLATFORM_MOBILE) - -NS_CC_BEGIN; - -/* -OpenGL GLU implementation -*/ - -/** OpenGL gluLookAt implementation */ -void CC_DLL_PS gluLookAt(GLfloat fEyeX, GLfloat fEyeY, GLfloat fEyeZ, - GLfloat fLookAtX, GLfloat fLookAtY, GLfloat fLookAtZ, - GLfloat fUpX, GLfloat fUpY, GLfloat fUpZ); - -/** OpenGL gluPerspective implementation */ -void CC_DLL_PS gluPerspective(GLfloat fovy, GLfloat aspect, GLfloat zNear, GLfloat zFar); - -NS_CC_END; - -#endif - -#endif // __CC_GL_H__ diff --git a/platform_support/proj.uphone/Makefile.ARM b/platform_support/proj.uphone/Makefile.ARM deleted file mode 100644 index 3ed3b77140..0000000000 --- a/platform_support/proj.uphone/Makefile.ARM +++ /dev/null @@ -1,68 +0,0 @@ - -############################################################################ -# -# Makefile for building : PlatformSupport_Arm.TMK3 -# Created by TMK3_V2.3, please do not modify. -# -############################################################################# - -TO_PROJECT_ROOT = ../../../PRJ_TG3 -OUTPUT_FILENAME = libPlatformSupportStatic.a - -include $(TO_PROJECT_ROOT)/MakeInclude/Makefile_Base_StaticLib.ARM -include $(TO_PROJECT_ROOT)/MakeInclude/Makefile_TOPS_Def.ARM - -DEFINES += -DCCX_UNDER_UPHONE \ - -D__TG3_PURE_DLL__ -INCLUDE_PATH += -I../include -I$(TO_PROJECT_ROOT)/Include/ThirdParty/libxml2 \ - -I$(TO_PROJECT_ROOT)/Include/ThirdParty/iconv \ - -I$(TO_PROJECT_ROOT)/Include/ThirdParty/libpng \ - -I$(TO_PROJECT_ROOT)/Include/ThirdParty/libjpeg - -OBJECTS_DIR = ./Debug-ARM -DESTDIR = $(TO_PROJECT_ROOT)/$(BIN_OUTPUT_DIR) -TARGET = $(DESTDIR)/$(OUTPUT_FILENAME) - -DEL_FILE = rm -f -MKDIR = mkdir -p - -first: all - -OBJECTS = \ - $(OBJECTS_DIR)/ccxCommon.o \ - $(OBJECTS_DIR)/ccxGL.o \ - $(OBJECTS_DIR)/ccxImage.o \ - $(OBJECTS_DIR)/ccxStdC.o \ - $(OBJECTS_DIR)/ccxThread.o - -ADD_OBJECTS += - -$(OBJECTS_DIR) : - $(MKDIR) $(OBJECTS_DIR) - -$(DESTDIR) : - $(MKDIR) $(DESTDIR) - -all : $(OBJECTS_DIR) $(DESTDIR) $(TARGET) - -$(TARGET) : $(OBJECTS) - $(LINK) $(LINK_FLAGS) -o $(TARGET) $(SYS_OBJECTS) $(OBJECTS) $(ADD_OBJECTS) $(LIBS) $(SYS_LIBS) - -clean : - -$(DEL_FILE) $(OBJECTS) - -$(DEL_FILE) $(TARGET) - -$(OBJECTS_DIR)/ccxCommon.o : ../src/ccxCommon.cpp - $(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/ccxCommon.o ../src/ccxCommon.cpp - -$(OBJECTS_DIR)/ccxGL.o : ../src/ccxGL.cpp - $(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/ccxGL.o ../src/ccxGL.cpp - -$(OBJECTS_DIR)/ccxImage.o : ../src/ccxImage.cpp - $(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/ccxImage.o ../src/ccxImage.cpp - -$(OBJECTS_DIR)/ccxStdC.o : ../src/ccxStdC.cpp - $(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/ccxStdC.o ../src/ccxStdC.cpp - -$(OBJECTS_DIR)/ccxThread.o : ../src/ccxThread.cpp - $(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/ccxThread.o ../src/ccxThread.cpp diff --git a/platform_support/proj.uphone/PlatformSupport.uphone.vcproj b/platform_support/proj.uphone/PlatformSupport.uphone.vcproj deleted file mode 100644 index c6b926ecf8..0000000000 --- a/platform_support/proj.uphone/PlatformSupport.uphone.vcproj +++ /dev/null @@ -1,253 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/platform_support/proj.uphone/PlatformSupport_Arm.TMK3 b/platform_support/proj.uphone/PlatformSupport_Arm.TMK3 deleted file mode 100644 index 47743c992e..0000000000 --- a/platform_support/proj.uphone/PlatformSupport_Arm.TMK3 +++ /dev/null @@ -1,56 +0,0 @@ -; -; TG3 Makefile Auto Create Script -; -; 说明： -; 1.在等号左边不要有空格 -; 2.所有的路径请使用"/"来分隔 -; 3.所有的文件名不可以有空格 -; 4.只能对当前目录及其子目录下的.c、.cpp生成Makefile - -;本TMK3文件目录位置到项目根目录之间的转换，不支持多个串，如果有多个，以最后一个为准 -;即 ./$(TO_PROJECT_ROOT)/ 就是项目的根目录 -TO_PROJECT_ROOT=../../PRJ_TG3 - -;输出目标的名字，不支持多个串，如果有多个，以最后一个为准 -OUTPUT_FILENAME=libPlatformSupport.so - -;包含的其他的TMK3文件，此文件和本文件一起构成MakeFile的内容 -;此项可以出现在TMK3文件内的任意地方，与已经存在的项依次组合 -;注意：此项不支持绝对路径，但是可以使用$(TO_PROJECT_ROOT)构成文件名 -INCLUDE_TMK3=$(TO_PROJECT_ROOT)/MakeInclude/TG3_APP_Arm.TMK3 ;TOPS标准应用，包括动态库等 - -;预定义串，生成MakeFile的时候直接放在MakeFile的前面 -;格式：PRE_DEFINE=STRING，生成MakeFile的时候，"PRE_DEFINE="后面的所有非注释非续行字符都会放在MakeFile前面 -;例如：PRE_DEFINE=AAA=BBB，会放入AAA=BBB到MakeFile中 -;可以使用多个PRE_DEFINE串，也可以使用PRE_DEFINE1、PRE_DEFINE2等方式，MakeFile中依据出现顺序(不是数字大小)排列 - -;C、C++预定义宏，可以使用多个DEFINES串，也可以使用DEFINES1、DEFINES2等方式，MakeFile中依据出现顺序(不是数字大小)排列 -DEFINES=-DCCX_UNDER_UPHONE ;这里填入应用的自定义宏。注意：ITOPS自己的所需定义会自动包含，故此这里仅仅包含应用自己特有的定义即可 -DEFINES=-D__TG3_PURE_DLL__ ;生成的是纯动态库（意思是：不是TOPS应用，但可以是TCOM组件） - -;包含路径，支持换行，后面不要加续行符，请连续使用INCLUDE_PATH1、INCLUDE_PATH2等标明多行 -;行号需要连续，不可跳跃 -INCLUDE_PATH=-I./include -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 -INCLUDE_PATH=-I$(TO_PROJECT_ROOT)/Include/ThirdParty/libjpeg - -;连接的库文件，可以使用多个LIBS串，也可以使用LIBS1、LIBS2等方式，MakeFile中依据出现顺序(不是数字大小)排列 -;LIBS=-lMyLib ;应用额外的连接库。注意：ITOPS自己的所需库自动包含，而且库包含路径也已经包含，故此这里仅仅包含应用自己特有的库的名字即可 - -LIBS= -;强制包含文件的名字，不能使用通配符，一定要使用相对或者绝对路径 -;极力要求使用相对路径，多个文件之间使用“|”分隔 -;强制包含文件指的是不在本文件夹及其子文件夹下的.c、.cpp、.o文件 -;可以使用多个INCLUDEFILE串，也可以使用INCLUDEFILE1、INCLUDEFILE2等方式，MakeFile中依据出现顺序(不是数字大小)排列 -INCLUDEFILE= - -;强制排除文件，不能使用通配符，一定要使用相对路径 -;多个文件之间使用“|”分隔，路径必须以"./"，"../"开始 -;只能对.c、.cpp文件进行排除 -;如果要排除本目录的文件也要加入"./" -;可以使用多个EXCLUDEFILE串，也可以使用EXCLUDEFILE1、EXCLUDEFILE2等方式，MakeFile中依据出现顺序(不是数字大小)排列 -EXCLUDEFILE= ./src/uphone/ -EXCLUDEFILE= ./src/win32/ -EXCLUDEFILE= ./src/android/ -EXCLUDEFILE= ./src/ios/ diff --git a/platform_support/proj.win32/libPlatformSupport.win32.vcproj b/platform_support/proj.win32/libPlatformSupport.win32.vcproj deleted file mode 100644 index 2aa73e4357..0000000000 --- a/platform_support/proj.win32/libPlatformSupport.win32.vcproj +++ /dev/null @@ -1,251 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/platform_support/src/uphone/NewDeleteOp.cpp b/platform_support/src/uphone/NewDeleteOp.cpp deleted file mode 100644 index e773818e7a..0000000000 --- a/platform_support/src/uphone/NewDeleteOp.cpp +++ /dev/null @@ -1,82 +0,0 @@ - -/*! -* @file NewDeleteOp.cpp -* @author 全智达 -* @brief -* -* @section Copyright -* =======================================================================
-*
-* Copyright (c) 2005-2010 Tranzda Technologies Co.,Ltd.
-* 深圳市全智达科技有限公司 版权所有2005-2010
-*
-* PROPRIETARY RIGHTS of Tranzda Technologies Co.,Ltd. are involved in
-* the subject matter of this material. All manufacturing, reproduction,
-* use, and sales rights pertaining to this subject matter are governed
-* by the license agreement. The recipient of this software implicitly
-* accepts the terms of the license.
-* 本软件文档资料是深圳市全智达科技有限公司的合法资产，任何人士阅读和使
-* 用本资料必须获得相应的书面授权,承担保密责任和接受相应的法律约束。
-*
-* 公司网址： http://www.tranzda.com
-* 公司邮箱：support@tranzda.com
-* =======================================================================
-*/ - -#include "ssTypes.h" -#include "TG3_Type.h" -#include "TG3_Memory.h" - -#ifdef new -#undef new -#endif - -#ifdef delete -#undef delete -#endif - -#ifndef _WIN32 - #define __cdecl -#endif - -void * __cdecl operator new(unsigned int size) -{ - return TMalloc(size); -} - -void * __cdecl operator new[](unsigned int size) -{ - return TMalloc(size); -} - -void * __cdecl operator new(unsigned int size, const unsigned short * fileName, int lineNo) -{ - return TMallocEx(size, fileName, lineNo); -} - -void * __cdecl operator new[](unsigned int size, const unsigned short * fileName, int lineNo) -{ - return TMallocEx(size, fileName, lineNo); -} - -void __cdecl operator delete(void *p) -{ - TFree(p); -} - -void __cdecl operator delete[](void *p) -{ - TFree(p); -} - -void __cdecl operator delete(void *p, const unsigned short * fileName, int lineNo) -{ - TFreeEx(p, fileName, lineNo); -} - -void __cdecl operator delete[](void *p, const unsigned short * fileName, int lineNo) -{ - TFreeEx(p, fileName, lineNo); -} - - diff --git a/platform_support/src/win32/ccxImage_win32.cpp b/platform_support/src/win32/ccxImage_win32.cpp deleted file mode 100644 index 6440288117..0000000000 --- a/platform_support/src/win32/ccxImage_win32.cpp +++ /dev/null @@ -1,338 +0,0 @@ -/**************************************************************************** -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. -****************************************************************************/ - -NS_CC_BEGIN; - -void ccxMessageBox(const ccxString& msg, const ccxString& title) -{ - MessageBoxA(NULL, msg.c_str(), title.c_str(), MB_OK); -} - -/** -@brief A memory DC which uses to draw text on bitmap. -*/ -class BitmapDC -{ -public: - BitmapDC(HWND hWnd = NULL) - : m_hDC(NULL) - , m_hBmp(NULL) - , m_hFont((HFONT)GetStockObject(DEFAULT_GUI_FONT)) - { - HDC hdc = GetDC(hWnd); - m_hDC = CreateCompatibleDC(hdc); - ReleaseDC(hWnd, hdc); - } - - ~BitmapDC() - { - prepareBitmap(0, 0); - if (m_hDC) - { - DeleteDC(m_hDC); - } - } - - bool setFont(const char * pFontName = NULL, int nSize = 0) - { - bool bRet = false; - do - { - HFONT hDefFont = (HFONT)GetStockObject(DEFAULT_GUI_FONT); - LOGFONTA tNewFont = {0}; - LOGFONTA tOldFont = {0}; - GetObjectA(hDefFont, sizeof(tNewFont), &tNewFont); - if (pFontName) - { - strcpy_s(tNewFont.lfFaceName, LF_FACESIZE, pFontName); - } - if (nSize) - { - tNewFont.lfHeight = -nSize; - } - GetObjectA(m_hFont, sizeof(tOldFont), &tOldFont); - - if (tOldFont.lfHeight == tNewFont.lfHeight - && ! strcpy(tOldFont.lfFaceName, tNewFont.lfFaceName)) - { - // already has the font - bRet = true; - break; - } - - // delete old font - if (m_hFont != hDefFont) - { - DeleteObject(m_hFont); - } - m_hFont = NULL; - - // create new font - m_hFont = CreateFontIndirectA(&tNewFont); - if (! m_hFont) - { - // create failed, use default font - m_hFont = hDefFont; - break; - } - - bRet = true; - } while (0); - return bRet; - } - - SIZE sizeWithText(const char * pszText, int nLen, DWORD dwFmt, LONG nWidthLimit) - { - SIZE tRet = {0}; - do - { - CC_BREAK_IF(! pszText || nLen <= 0); - - RECT rc = {0, 0, 0, 0}; - DWORD dwCalcFmt = DT_CALCRECT; - - if (nWidthLimit > 0) - { - rc.right = nWidthLimit; - dwCalcFmt |= DT_WORDBREAK - | (dwFmt & DT_CENTER) - | (dwFmt & DT_RIGHT); - } - // use current font to measure text extent - HGDIOBJ hOld = SelectObject(m_hDC, m_hFont); - - // measure text size - DrawTextA(m_hDC, pszText, nLen, &rc, dwCalcFmt); - SelectObject(m_hDC, hOld); - - tRet.cx = rc.right; - tRet.cy = rc.bottom; - } while (0); - - return tRet; - } - - bool prepareBitmap(int nWidth, int nHeight) - { - // release bitmap - if (m_hBmp) - { - DeleteObject(m_hBmp); - m_hBmp = NULL; - } - if (nWidth > 0 && nHeight > 0) - { - m_hBmp = CreateBitmap(nWidth, nHeight, 1, 32, NULL); - if (! m_hBmp) - { - return false; - } - } - return true; - } - - int drawText(const char * pszText, SIZE& tSize, CCImage::ETextAlign eAlign) - { - int nRet = 0; - do - { - CC_BREAK_IF(! pszText); - - DWORD dwFmt = DT_WORDBREAK; - DWORD dwHoriFlag = eAlign & 0x0f; - DWORD dwVertFlag = (eAlign & 0xf0) >> 4; - - switch (dwHoriFlag) - { - case 1: // left - dwFmt |= DT_LEFT; - break; - case 2: // right - dwFmt |= DT_RIGHT; - break; - case 3: // center - dwFmt |= DT_CENTER; - break; - } - - int nLen = strlen(pszText); - SIZE newSize = sizeWithText(pszText, nLen, dwFmt, tSize.cx); - - RECT rcText = {0}; - // if content width is 0, use text size as content size - if (tSize.cx <= 0) - { - tSize = newSize; - rcText.right = newSize.cx; - rcText.bottom = newSize.cy; - } - else - { - - LONG offsetX = 0; - LONG offsetY = 0; - rcText.right = newSize.cx; // store the text width to rectangle - - // calculate text horizontal offset - if (1 != dwHoriFlag // and text isn't align to left - && newSize.cx < tSize.cx) // and text's width less then content width, - { // then need adjust offset of X. - offsetX = (2 == dwHoriFlag) ? tSize.cx - newSize.cx // align to right - : (tSize.cx - newSize.cx) / 2; // align to center - } - - // if content height is 0, use text height as content height - // else if content height less than text height, use content height to draw text - if (tSize.cy <= 0) - { - tSize.cy = newSize.cy; - dwFmt |= DT_NOCLIP; - rcText.bottom = newSize.cy; // store the text height to rectangle - } - else if (tSize.cy < newSize.cy) - { - // content height larger than text height need, clip text to rect - rcText.bottom = tSize.cy; - } - else - { - rcText.bottom = newSize.cy; // store the text height to rectangle - - // content larger than text, need adjust vertical position - dwFmt |= DT_NOCLIP; - - // calculate text vertical offset - offsetY = (2 == dwVertFlag) ? tSize.cy - newSize.cy // align to bottom - : (3 == dwVertFlag) ? (tSize.cy - newSize.cy) / 2 // align to middle - : 0; // align to top - } - - if (offsetX || offsetY) - { - OffsetRect(&rcText, offsetX, offsetY); - } - } - - CC_BREAK_IF(! prepareBitmap(tSize.cx, tSize.cy)); - - // draw text - HGDIOBJ hOldFont = SelectObject(m_hDC, m_hFont); - HGDIOBJ hOldBmp = SelectObject(m_hDC, m_hBmp); - - RECT rc = {0, 0, tSize.cx, tSize.cy}; - SetBkMode(m_hDC, TRANSPARENT); - SetTextColor(m_hDC, RGB(255, 255, 255)); // white color - nRet = DrawTextA(m_hDC, pszText, nLen, &rcText, dwFmt); - - SelectObject(m_hDC, hOldBmp); - SelectObject(m_hDC, hOldFont); - } while (0); - return nRet; - } - - CC_SYNTHESIZE_READONLY(HDC, m_hDC, DC); - CC_SYNTHESIZE_READONLY(HBITMAP, m_hBmp, Bitmap); -private: - friend class CCImage; - HFONT m_hFont; -}; - -static BitmapDC& sharedBitmapDC() -{ - static BitmapDC s_BmpDC; - return s_BmpDC; -} - -bool CCImage::initWithString( - const char * pText, - int nWidth/* = 0*/, - int nHeight/* = 0*/, - ETextAlign eAlignMask/* = kAlignCenter*/, - const char * pFontName/* = nil*/, - int nSize/* = 0*/) -{ - bool bRet = false; - do - { - CC_BREAK_IF(! pText); - int nLen = strlen(pText); - - BitmapDC& dc = sharedBitmapDC(); - - if (! dc.setFont(pFontName, nSize)) - { - CCLog("Can't found font(%s), use system default", pFontName); - } - - // draw text - SIZE size = {nWidth, nHeight}; - CC_BREAK_IF(! dc.drawText(pText, size, eAlignMask)); - - m_pData.reset(new ccxByte[size.cx * size.cy * 4]); - CC_BREAK_IF(! m_pData.get()); - - struct - { - BITMAPINFOHEADER bmiHeader; - int mask[4]; - } bi = {0}; - bi.bmiHeader.biSize = sizeof(bi.bmiHeader); - CC_BREAK_IF(! GetDIBits(dc.getDC(), dc.getBitmap(), 0, 0, - NULL, (LPBITMAPINFO)&bi, DIB_RGB_COLORS)); - - m_nWidth = (ccxInt16)size.cx; - m_nHeight = (ccxInt16)size.cy; - m_bHasAlpha = true; - m_bPreMulti = false; - m_nBitsPerComponent = 8; - - // copy pixed data - bi.bmiHeader.biHeight = (bi.bmiHeader.biHeight > 0) - ? - bi.bmiHeader.biHeight : bi.bmiHeader.biHeight; - GetDIBits(dc.getDC(), dc.getBitmap(), 0, m_nHeight, m_pData.get(), - (LPBITMAPINFO)&bi, DIB_RGB_COLORS); - - // change pixel's alpha value to 255, when it's RGB != 0 - COLORREF * pPixel = NULL; - for (int y = 0; y < m_nHeight; ++y) - { - pPixel = (COLORREF *)m_pData.get() + y * m_nWidth; - for (int x = 0; x < m_nWidth; ++x) - { - COLORREF& clr = *pPixel; - if (GetRValue(clr) || GetGValue(clr) || GetBValue(clr)) - { - clr |= 0xff000000; - } - ++pPixel; - } - } - - bRet = true; - } while (0); - - return bRet; -} - -NS_CC_END;