Platform fixed

cocos/2d/CCActionCamera.cpp

@@ -27,7 +27,7 @@ THE SOFTWARE.
 
 #include "2d/CCActionCamera.h"
 #include "2d/CCNode.h"
-#include "CCStdC.h"
+#include "platform/CCStdC.h"
 
 NS_CC_BEGIN
 //

cocos/2d/CCActionInterval.cpp

@@ -26,16 +26,17 @@ THE SOFTWARE.
 ****************************************************************************/
 
 #include "2d/CCActionInterval.h"
+
+#include <stdarg.h>
+
 #include "2d/CCSprite.h"
 #include "2d/CCNode.h"
 #include "2d/CCSpriteFrame.h"
-#include "CCStdC.h"
 #include "2d/CCActionInstant.h"
 #include "base/CCDirector.h"
 #include "base/CCEventCustom.h"
 #include "base/CCEventDispatcher.h"
-
+#include "platform/CCStdC.h"
-#include <stdarg.h>
 
 NS_CC_BEGIN
 

cocos/2d/CCClippingNode.h

@@ -29,7 +29,7 @@
 #define __MISCNODE_CCCLIPPING_NODE_H__
 
 #include "2d/CCNode.h"
-#include "CCGL.h"
+#include "platform/CCGL.h"
 #include "renderer/CCGroupCommand.h"
 #include "renderer/CCCustomCommand.h"
 

cocos/2d/CCDrawNode.cpp

@@ -22,7 +22,6 @@
  */
 
 #include "2d/CCDrawNode.h"
-#include "CCGL.h"
 #include "base/CCEventType.h"
 #include "base/CCConfiguration.h"
 #include "renderer/CCRenderer.h"
@@ -31,6 +30,7 @@
 #include "base/CCDirector.h"
 #include "base/CCEventListenerCustom.h"
 #include "base/CCEventDispatcher.h"
+#include "platform/CCGL.h"
 
 NS_CC_BEGIN
 

cocos/2d/CCDrawingPrimitives.cpp

@@ -41,12 +41,12 @@ THE SOFTWARE.
 #include <string.h>
 #include <cmath>
 
-#include "CCGL.h"
+#include "2d/CCActionCatmullRom.h"
 #include "base/CCDirector.h"
 #include "renderer/ccGLStateCache.h"
 #include "renderer/CCGLProgramCache.h"
-#include "2d/CCActionCatmullRom.h"
 #include "renderer/CCRenderer.h"
+#include "platform/CCGL.h"
 
 NS_CC_BEGIN
 #ifndef M_PI

cocos/2d/CCFontAtlas.h

@@ -25,12 +25,13 @@
 #ifndef _CCFontAtlas_h_
 #define _CCFontAtlas_h_
 
-#include "base/CCPlatformMacros.h"
-#include "base/CCRef.h"
-#include "CCStdC.h" // ssize_t on windows
 #include <string>
 #include <unordered_map>
 
+#include "base/CCPlatformMacros.h"
+#include "base/CCRef.h"
+#include "platform/CCStdC.h" // ssize_t on windows
+
 NS_CC_BEGIN
 
 //fwd

cocos/2d/CCGLBufferedNode.h

@@ -25,7 +25,7 @@ THE SOFTWARE.
 #ifndef __CC_GL_BUFFERED_NODE__
 #define __CC_GL_BUFFERED_NODE__
 
-#include "CCGL.h"
+#include "platform/CCGL.h"
 
 class GLBufferedNode
 {

cocos/2d/CCGrabber.h

@@ -27,7 +27,7 @@ THE SOFTWARE.
 #define __EFFECTS_CCGRABBER_H__
 
 #include "base/CCRef.h"
-#include "CCGL.h"
+#include "platform/CCGL.h"
 
 NS_CC_BEGIN
 

cocos/2d/CCGrid.cpp

@@ -34,7 +34,7 @@ THE SOFTWARE.
 #include "renderer/ccGLStateCache.h"
 #include "renderer/CCRenderer.h"
 #include "renderer/CCTexture2D.h"
-#include "CCGL.h"
+#include "platform/CCGL.h"
 
 NS_CC_BEGIN
 // implementation of GridBase

cocos/2d/CCMenu.cpp

@@ -26,9 +26,9 @@ THE SOFTWARE.
 #include "2d/CCMenu.h"
 #include "base/CCDirector.h"
 #include "base/CCTouch.h"
-#include "CCStdC.h"
 #include "base/CCEventListenerTouch.h"
 #include "base/CCEventDispatcher.h"
+#include "platform/CCStdC.h"
 #include "deprecated/CCString.h"
 
 #include <vector>

cocos/Android.mk

@@ -122,7 +122,7 @@ base/CCScheduler.cpp \
 base/CCScriptSupport.cpp \
 base/CCTouch.cpp \
 base/CCUserDefault.cpp \
-base/CCUserDefaultAndroid.cpp \
+base/CCUserDefault-android.cpp \
 base/CCValue.cpp \
 base/TGAlib.cpp \
 base/ZipUtils.cpp \

cocos/base/CCConfiguration.h

@@ -27,11 +27,12 @@ THE SOFTWARE.
 #ifndef __CCCONFIGURATION_H__
 #define __CCCONFIGURATION_H__
 
-#include "base/CCRef.h"
-#include "CCGL.h"
-#include "base/CCValue.h"
 #include <string>
 
+#include "base/CCRef.h"
+#include "base/CCValue.h"
+#include "platform/CCGL.h"
+
 NS_CC_BEGIN
 
 /**

cocos/base/CCData.h

@@ -29,7 +29,7 @@
 #include "base/CCPlatformMacros.h"
 #include <stdint.h> // for ssize_t on android
 #include <string>   // for ssize_t on linux
-#include "CCStdC.h" // for ssize_t on window
+#include "platform/CCStdC.h" // for ssize_t on window
 
 NS_CC_BEGIN
 

cocos/base/CCDirector.cpp

@@ -57,9 +57,8 @@ THE SOFTWARE.
 #include "base/CCConsole.h"
 #include "base/CCAutoreleasePool.h"
 #include "base/CCConfiguration.h"
-
+#include "platform/CCApplication.h"
-#include "CCApplication.h"
+//#include "platform/CCGLViewImpl.h"
-#include "CCGLViewImpl.h"
 
 /**
  Position of the FPS

cocos/base/CCDirector.h

@@ -28,14 +28,14 @@ THE SOFTWARE.
 #ifndef __CCDIRECTOR_H__
 #define __CCDIRECTOR_H__
 
-#include "base/CCPlatformMacros.h"
+#include <stack>
 
+#include "base/CCPlatformMacros.h"
 #include "base/CCRef.h"
 #include "base/CCVector.h"
 #include "2d/CCScene.h"
-#include "CCGL.h"
-#include <stack>
 #include "math/CCMath.h"
+#include "platform/CCGL.h"
 #include "platform/CCGLView.h"
 
 NS_CC_BEGIN

cocos/base/CCEventDispatcher.h

@@ -34,7 +34,7 @@
 #include "base/CCPlatformMacros.h"
 #include "base/CCEventListener.h"
 #include "base/CCEvent.h"
-#include "CCStdC.h"
+#include "platform/CCStdC.h"
 
 NS_CC_BEGIN
 

cocos/base/CCPlatformConfig.h

@@ -27,7 +27,9 @@ THE SOFTWARE.
 #define __BASE_CC_PLATFORM_CONFIG_H__
 
 /**
-Config of cocos2d-x project, per target platform.
+  Config of cocos2d-x project, per target platform.
+  
+  THIS FILE MUST NOT INCLUDE ANY OTHER FILE
 */
 
 //////////////////////////////////////////////////////////////////////////

cocos/base/CCPlatformMacros.h

@@ -30,7 +30,7 @@ Copyright (c) 2013-2014 Chukong Technologies
  */
 #include "base/ccConfig.h"
 #include "base/CCPlatformConfig.h"
-#include "CCPlatformDefine.h"
+#include "platform/CCPlatformDefine.h"
 
 /**
  * define a create function for a specific type, such as Layer

cocos/base/ZipUtils.h

@@ -27,14 +27,14 @@ THE SOFTWARE.
 
 #include <string>
 #include "base/CCPlatformConfig.h"
-#include "CCPlatformDefine.h"
 #include "base/CCPlatformMacros.h"
+#include "platform/CCPlatformDefine.h"
 
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
-#include "platform/android/CCFileUtilsAndroid.h"
+#include "platform/android/CCFileUtils-android.h"
 #elif(CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) || (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) || (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT)
 // for import ssize_t on win32 platform
-#include "CCStdC.h"
+#include "platform/CCStdC.h"
 #endif
 
 namespace cocos2d

cocos/base/atitc.h

@@ -26,7 +26,7 @@
 #ifndef COCOS2DX_PLATFORM_THIRDPARTY_ATITC_
 #define COCOS2DX_PLATFORM_THIRDPARTY_ATITC_
 
-#include "CCStdC.h"
+#include "platform/CCStdC.h"
 
 enum class ATITCDecodeFlag
 {

cocos/base/ccMacros.h

@@ -33,7 +33,7 @@ THE SOFTWARE.
 #endif
 
 #include "base/CCConsole.h"
-#include "CCStdC.h"
+#include "platform/CCStdC.h"
 
 #ifndef CCASSERT
 #if COCOS2D_DEBUG > 0

cocos/base/ccTypes.h

@@ -32,8 +32,8 @@ THE SOFTWARE.
 
 #include "math/CCGeometry.h"
 #include "math/CCMath.h"
-#include "CCGL.h"
+#include "base/CCRef.h"
-#include "CCRef.h"
+#include "platform/CCGL.h"
 
 NS_CC_BEGIN
 

cocos/base/s3tc.h

@@ -26,7 +26,7 @@
 #ifndef COCOS2DX_PLATFORM_THIRDPARTY_S3TC_
 #define COCOS2DX_PLATFORM_THIRDPARTY_S3TC_
 
-#include "CCStdC.h"
+#include "platform/CCStdC.h"
 
 enum class S3TCDecodeFlag
 {

cocos/cocos2d.h

@@ -179,17 +179,17 @@ THE SOFTWARE.
 #include "base/CCPlatformMacros.h"
 
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS)
-    #include "platform/ios/CCApplication.h"
+    #include "platform/ios/CCApplication-ios.h"
-    #include "platform/ios/CCGLViewImpl.h"
+    #include "platform/ios/CCGLViewImpl-ios.h"
-    #include "platform/ios/CCGL.h"
+    #include "platform/ios/CCGL-ios.h"
-    #include "platform/ios/CCStdC.h"
+    #include "platform/ios/CCStdC-ios.h"
 #endif // CC_TARGET_PLATFORM == CC_PLATFORM_IOS
 
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
-    #include "platform/android/CCApplication.h"
+    #include "platform/android/CCApplication-android.h"
-    #include "platform/android/CCGLViewImpl.h"
+    #include "platform/android/CCGLViewImpl-android.h"
-    #include "platform/android/CCGL.h"
+    #include "platform/android/CCGL-android.h"
-    #include "platform/android/CCStdC.h"
+    #include "platform/android/CCStdC-android.h"
 #endif // CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID
 
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_BLACKBERRY)
@@ -200,24 +200,24 @@ THE SOFTWARE.
 #endif // CC_TARGET_PLATFORM == CC_PLATFORM_BLACKBERRY
 
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32)
-    #include "platform/win32/CCApplication.h"
+    #include "platform/win32/CCApplication-win32.h"
-    #include "platform/desktop/CCGLViewImpl.h"
+    #include "platform/desktop/CCGLViewImpl-win32.h"
-    #include "platform/win32/CCGL.h"
+    #include "platform/win32/CCGL-win32.h"
-    #include "platform/win32/CCStdC.h"
+    #include "platform/win32/CCStdC-win32.h"
 #endif // CC_TARGET_PLATFORM == CC_PLATFORM_WIN32
 
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
-    #include "platform/mac/CCApplication.h"
+    #include "platform/desktop/CCGLViewImpl-desktop.h"
-    #include "platform/desktop/CCGLViewImpl.h"
+    #include "platform/mac/CCApplication-mac.h"
-    #include "platform/mac/CCGL.h"
+    #include "platform/mac/CCGL-mac.h"
-    #include "platform/mac/CCStdC.h"
+    #include "platform/mac/CCStdC-mac.h"
 #endif // CC_TARGET_PLATFORM == CC_PLATFORM_MAC
 
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_LINUX)
-    #include "platform/linux/CCApplication.h"
+    #include "platform/linux/CCApplication-linux.h"
-    #include "platform/desktop/CCGLViewImpl.h"
+    #include "platform/desktop/CCGLViewImpl-desktop.h"
-    #include "platform/linux/CCGL.h"
+    #include "platform/linux/CCGL-linux.h"
-    #include "platform/linux/CCStdC.h"
+    #include "platform/linux/CCStdC-linux.h"
 #endif // CC_TARGET_PLATFORM == CC_PLATFORM_LINUX
 
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT)
@@ -230,7 +230,7 @@ THE SOFTWARE.
 
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_WP8)
 	#include "platform/winrt/CCApplication.h"
-	#include "platform/wp8/CCGLViewImpl.h"
+	#include "platform/wp8/CCGLViewImpl-wp8.h"
 	#include "platform/winrt/CCGL.h"
 	#include "platform/winrt/CCStdC.h"
 	#include "platform/winrt/CCPrecompiledShaders.h"

cocos/editor-support/cocostudio/CCActionFrameEasing.cpp

@@ -25,7 +25,7 @@ THE SOFTWARE.
 #include <math.h>
 #include "cocostudio/CCActionFrameEasing.h"
 #include "cocostudio/DictionaryHelper.h"
-#include "CCStdC.h"
+#include "platform/CCStdC.h"
 
 namespace cocostudio {
 

cocos/math/TransformUtils.h

@@ -28,7 +28,7 @@ THE SOFTWARE.
 #define __SUPPORT_TRANSFORM_UTILS_H__
 
 // TODO: when in MAC or windows, it includes <OpenGL/gl.h>
-#include "CCGL.h"
+#include "platform/CCGL.h"
 #include "base/ccMacros.h"
 
 namespace   cocos2d {

cocos/network/WebSocket.h

@@ -30,11 +30,12 @@
 #ifndef __CC_WEBSOCKET_H__
 #define __CC_WEBSOCKET_H__
 
-#include "base/CCPlatformMacros.h"
-#include "CCStdC.h"
 #include <string>
 #include <vector>
 
+#include "base/CCPlatformMacros.h"
+#include "platform/CCStdC.h"
+
 struct libwebsocket;
 struct libwebsocket_context;
 struct libwebsocket_protocols;

cocos/platform/CCApplication.h

@@ -0,0 +1,45 @@
+/****************************************************************************
+Copyright (c) 2010-2012 cocos2d-x.org
+Copyright (c) 2013-2014 Chukong Technologies Inc.
+
+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 __PLATFORM_CCAPPLICATION_H__
+#define __PLATFORM_CCAPPLICATION_H__
+
+#include "base/CCPlatformConfig.h"
+
+#if CC_TARGET_PLATFORM == CC_PLATFORM_MAC
+#include "platform/mac/CCApplication-mac.h"
+#elif CC_TARGET_PLATFORM == CC_PLATFORM_IOS
+#include "platform/ios/CCApplication-ios.h"
+#elif CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID
+#include "platform/android/CCApplication-android.h"
+#elif CC_TARGET_PLATFORM == CC_PLATFORM_WIN32
+#include "platform/win32/CCApplication-win32.h"
+#elif CC_TARGET_PLATFORM == CC_PLATFORM_WP8
+#include "platform/winrt/CCApplication.h"
+#elif CC_TARGET_PLATFORM == CC_PLATFORM_LINUX
+#include "platform/linux/CCApplication-linux.h"
+#endif
+
+#endif /* __PLATFORM_CCAPPLICATION_H__*/

cocos/platform/CCGL.h

@@ -0,0 +1,45 @@
+/****************************************************************************
+Copyright (c) 2010-2012 cocos2d-x.org
+Copyright (c) 2013-2014 Chukong Technologies Inc.
+
+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 __PLATFORM_CCGL_H__
+#define __PLATFORM_CCGL_H__
+
+#include "base/CCPlatformConfig.h"
+
+#if CC_TARGET_PLATFORM == CC_PLATFORM_MAC
+#include "platform/mac/CCGL-mac.h"
+#elif CC_TARGET_PLATFORM == CC_PLATFORM_IOS
+#include "platform/ios/CCGL-ios.h"
+#elif CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID
+#include "platform/android/CCGL-android.h"
+#elif CC_TARGET_PLATFORM == CC_PLATFORM_WIN32
+#include "platform/win32/CCGL-win32.h"
+#elif CC_TARGET_PLATFORM == CC_PLATFORM_WP8
+#include "platform/winrt/CCGL.h"
+#elif CC_TARGET_PLATFORM == CC_PLATFORM_LINUX
+#include "platform/linux/CCGL-linux.h"
+#endif
+
+#endif /* __PLATFORM_CCPLATFORMDEFINE_H__*/

cocos/platform/CCImage.cpp

@@ -85,7 +85,7 @@ extern "C"
 #include "base/ccUtils.h"
 #include "base/ZipUtils.h"
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
-#include "android/CCFileUtilsAndroid.h"
+#include "android/CCFileUtils-android.h"
 #endif
 
 #define CC_GL_ATC_RGB_AMD                                          0x8C92

cocos/platform/CCPlatformDefine.h

@@ -0,0 +1,45 @@
+/****************************************************************************
+Copyright (c) 2010-2012 cocos2d-x.org
+Copyright (c) 2013-2014 Chukong Technologies Inc.
+
+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 __PLATFORM_CCPLATFORMDEFINE_H__
+#define __PLATFORM_CCPLATFORMDEFINE_H__
+
+#include "base/CCPlatformConfig.h"
+
+#if CC_TARGET_PLATFORM == CC_PLATFORM_MAC
+#include "platform/mac/CCPlatformDefine-mac.h"
+#elif CC_TARGET_PLATFORM == CC_PLATFORM_IOS
+#include "platform/ios/CCPlatformDefine-ios.h"
+#elif CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID
+#include "platform/android/CCPlatformDefine-android.h"
+#elif CC_TARGET_PLATFORM == CC_PLATFORM_WIN32
+#include "platform/win32/CCPlatformDefine-win32.h"
+#elif CC_TARGET_PLATFORM == CC_PLATFORM_WP8
+#include "platform/wp8/CCPlatformDefine-wp8.h"
+#elif CC_TARGET_PLATFORM == CC_PLATFORM_LINUX
+#include "platform/linux/CCPlatformDefine-linux.h"
+#endif
+
+#endif /* __PLATFORM_CCPLATFORMDEFINE_H__*/

cocos/platform/CCStdC.h

@@ -0,0 +1,45 @@
+/****************************************************************************
+Copyright (c) 2010-2012 cocos2d-x.org
+Copyright (c) 2013-2014 Chukong Technologies Inc.
+
+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 __PLATFORM_CCSTDC_H__
+#define __PLATFORM_CCSTDC_H__
+
+#include "base/CCPlatformConfig.h"
+
+#if CC_TARGET_PLATFORM == CC_PLATFORM_MAC
+#include "platform/mac/CCStdC-mac.h"
+#elif CC_TARGET_PLATFORM == CC_PLATFORM_IOS
+#include "platform/ios/CCStdC-ios.h"
+#elif CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID
+#include "platform/android/CCStdC-android.h"
+#elif CC_TARGET_PLATFORM == CC_PLATFORM_WIN32
+#include "platform/win32/CCStdC-win32.h"
+#elif CC_TARGET_PLATFORM == CC_PLATFORM_WP8
+#include "platform/winrt/CCStdC.h"
+#elif CC_TARGET_PLATFORM == CC_PLATFORM_LINUX
+#include "platform/linux/CCStdC-linux.h"
+#endif
+
+#endif /* __PLATFORM_CCSTDC_H__*/

cocos/platform/android/Android.mk

@@ -7,12 +7,12 @@ LOCAL_MODULE := cocos2dxandroid_static
 LOCAL_MODULE_FILENAME := libcocos2dandroid
 
 LOCAL_SRC_FILES := \
-CCApplication.cpp \
+CCApplication-android.cpp \
-CCCommon.cpp \
+CCCommon-android.cpp \
-CCDevice.cpp \
+CCDevice-android.cpp \
-CCGLViewImpl.cpp \
+CCGLViewImpl-android.cpp \
-CCFileUtilsAndroid.cpp \
+CCFileUtils-android.cpp \
-javaactivity.cpp \
+javaactivity-android.cpp \
 jni/DPIJni.cpp \
 jni/IMEJni.cpp \
 jni/Java_org_cocos2dx_lib_Cocos2dxAccelerometer.cpp \

cocos/platform/android/CCFileUtils-android.cpp

@@ -26,7 +26,7 @@ THE SOFTWARE.
 #include "base/CCPlatformConfig.h"
 #if CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID
 
-#include "CCFileUtilsAndroid.h"
+#include "CCFileUtils-android.h"
 #include "platform/CCCommon.h"
 #include "jni/Java_org_cocos2dx_lib_Cocos2dxHelper.h"
 #include "android/asset_manager.h"
@@ -34,7 +34,7 @@ THE SOFTWARE.
 
 #include <stdlib.h>
 
-#define  LOG_TAG    "CCFileUtilsAndroid.cpp"
+#define  LOG_TAG    "CCFileUtils-android.cpp"
 #define  LOGD(...)  __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__)
 
 using namespace std;

cocos/platform/android/CCGLViewImpl-android.cpp

@@ -26,7 +26,7 @@ THE SOFTWARE.
 #include "base/CCPlatformConfig.h"
 #if CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID
 
-#include "CCGLViewImpl.h"
+#include "CCGLViewImpl-android.h"
 #include "base/CCDirector.h"
 #include "base/ccMacros.h"
 #include "jni/IMEJni.h"

cocos/platform/android/java/project.properties

@@ -12,4 +12,4 @@
 
 android.library=true
 # Project target.
-target=android-10
+target=android-20

cocos/platform/android/javaactivity-android.cpp

@@ -25,7 +25,8 @@ THE SOFTWARE.
 #include "base/CCPlatformConfig.h"
 #if CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID
 
-#include "CCApplication.h"
+#include "CCApplication-android.h"
+#include "CCGLViewImpl-android.h"
 #include "base/CCDirector.h"
 #include "base/CCEventCustom.h"
 #include "base/CCEventType.h"
@@ -34,7 +35,6 @@ THE SOFTWARE.
 #include "renderer/CCTextureCache.h"
 #include "renderer/ccGLStateCache.h"
 #include "2d/CCDrawingPrimitives.h"
-#include "CCGLViewImpl.h"
 #include "platform/android/jni/JniHelper.h"
 #include <android/log.h>
 #include <jni.h>

cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp

@@ -27,7 +27,7 @@ THE SOFTWARE.
 #include <android/log.h>
 #include <string>
 #include "JniHelper.h"
-#include "CCFileUtilsAndroid.h"
+#include "CCFileUtils-android.h"
 #include "android/asset_manager_jni.h"
 #include "deprecated/CCString.h"
 #include "Java_org_cocos2dx_lib_Cocos2dxHelper.h"

cocos/platform/android/jni/TouchesJni.cpp

@@ -24,7 +24,7 @@ THE SOFTWARE.
 #include "base/CCDirector.h"
 #include "base/CCEventKeyboard.h"
 #include "base/CCEventDispatcher.h"
-#include "CCGLViewImpl.h"
+#include "platform/android/CCGLViewImpl-android.h"
 
 #include <android/log.h>
 #include <jni.h>

cocos/platform/apple/CCFileUtils-apple.mm

@@ -25,7 +25,7 @@ THE SOFTWARE.
 ****************************************************************************/
 #import <Foundation/Foundation.h>
 
-#include "CCFileUtilsApple.h"
+#include "CCFileUtils-apple.h"
 
 #include <string>
 #include <stack>

cocos/platform/apple/CCLock-apple.cpp

@@ -22,7 +22,8 @@ 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 "CCLock.h"
+
+#include "CCLock-apple.h"
 
 NS_CC_BEGIN
 

cocos/platform/desktop/CCGLViewImpl-desktop.cpp

@@ -23,8 +23,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ****************************************************************************/
 
-#include "CCGLViewImpl.h"
+#include "CCGLViewImpl-desktop.h"
-#include "CCApplication.h"
+
+#include <unordered_map>
+
+#include "platform/CCApplication.h"
 #include "base/CCDirector.h"
 #include "base/CCTouch.h"
 #include "base/CCEventDispatcher.h"
@@ -34,7 +37,6 @@ THE SOFTWARE.
 #include "base/ccUtils.h"
 #include "base/ccUTF8.h"
 
-#include <unordered_map>
 
 NS_CC_BEGIN
 

cocos/platform/ios/CCApplication-ios.mm

@@ -29,8 +29,8 @@
 
 #import <UIKit/UIKit.h>
 
-#import "CCGeometry.h"
+#import "math/CCGeometry.h"
-#import "CCDirectorCaller.h"
+#import "CCDirectorCaller-ios.h"
 
 NS_CC_BEGIN
 

cocos/platform/ios/CCDirectorCaller-ios.mm

@@ -26,11 +26,13 @@
 #include "base/CCPlatformConfig.h"
 #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS
 
+#import "CCDirectorCaller-ios.h"
+
 #import <Foundation/Foundation.h>
 #import <OpenGLES/EAGL.h>
-#import "CCDirectorCaller.h"
+
-#import "CCDirector.h"
+#import "base/CCDirector.h"
-#import "CCEAGLView.h"
+#import "CCEAGLView-ios.h"
 
 static id s_sharedDirectorCaller;
 

cocos/platform/ios/CCEAGLView-ios.h

@@ -71,7 +71,7 @@ Copyright (C) 2008 Apple Inc. All Rights Reserved.
 #import <OpenGLES/ES2/glext.h>
 #import <CoreFoundation/CoreFoundation.h>
 
-#import "CCESRenderer.h"
+#import "CCESRenderer-ios.h"
 
 //CLASS INTERFACE:
 

cocos/platform/ios/CCEAGLView-ios.mm

@@ -64,15 +64,18 @@ Copyright (C) 2008 Apple Inc. All Rights Reserved.
 #include "base/CCPlatformConfig.h"
 #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS
 
+#import "CCEAGLView-ios.h"
+
 #import <QuartzCore/QuartzCore.h>
-#import "CCGLViewImpl.h"
+
-#import "CCEAGLView.h"
+#import "base/CCDirector.h"
-#import "CCES2Renderer.h"
+#import "deprecated/CCSet.h"
-#import "CCDirector.h"
+#import "base/CCTouch.h"
-#import "CCSet.h"
+#import "base/CCIMEDispatcher.h"
-#import "CCTouch.h"
+#import "CCGLViewImpl-ios.h"
-#import "CCIMEDispatcher.h"
+#import "CCES2Renderer-ios.h"
-#import "OpenGL_Internal.h"
+#import "OpenGL_Internal-ios.h"
+
 //CLASS IMPLEMENTATIONS:
 
 #define IOS_MAX_TOUCHES_COUNT     10

cocos/platform/ios/CCES2Renderer-ios.h

@@ -31,11 +31,13 @@
 #include "base/CCPlatformConfig.h"
 #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS
 
-#import "CCPlatformMacros.h"
+#import "CCESRenderer-ios.h"
-#import "CCESRenderer.h"
+
 #import <OpenGLES/ES2/gl.h>
 #import <OpenGLES/ES2/glext.h>
 
+#import "CCPlatformMacros.h"
+
 @interface CCES2Renderer : NSObject <CCESRenderer>
 {
     // The pixel dimensions of the CAEAGLLayer

cocos/platform/ios/CCES2Renderer-ios.m

@@ -28,12 +28,13 @@
 // Only compile this code on iOS. These files should NOT be included on your Mac project.
 // But in case they are included, it won't be compiled.
 
-#import "CCES2Renderer.h"
+#include "base/CCPlatformConfig.h"
 
 #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS
 
-#import "CCPlatformMacros.h"
+#import "CCES2Renderer-ios.h"
-#import "OpenGL_Internal.h"
+#import "base/CCPlatformMacros.h"
+#import "OpenGL_Internal-ios.h"
 
 #if !defined(COCOS2D_DEBUG) || COCOS2D_DEBUG == 0
 #define NSLog(...)       do {} while (0)

cocos/platform/ios/CCGLViewImpl-ios.mm

@@ -28,9 +28,9 @@
 
 #import <UIKit/UIKit.h>
 
-#include "CCEAGLView.h"
+#include "CCEAGLView-ios.h"
-#include "CCDirectorCaller.h"
+#include "CCDirectorCaller-ios.h"
-#include "CCGLViewImpl.h"
+#include "CCGLViewImpl-ios.h"
 #include "CCSet.h"
 #include "base/CCTouch.h"