diff --git a/build/cocos2d_libs.xcodeproj/project.pbxproj b/build/cocos2d_libs.xcodeproj/project.pbxproj index 4b84128ccd..4f12f69323 100644 --- a/build/cocos2d_libs.xcodeproj/project.pbxproj +++ b/build/cocos2d_libs.xcodeproj/project.pbxproj @@ -897,7 +897,7 @@ 15AE1B9519AADA9A00C27E9E /* CocosGUI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9E918CF08D000240AA3 /* CocosGUI.cpp */; }; 15AE1B9619AADA9A00C27E9E /* CocosGUI.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9EA18CF08D000240AA3 /* CocosGUI.h */; }; 15AE1B9719AADAA100C27E9E /* UIVideoPlayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 3EA0FB69191C841D00B170C8 /* UIVideoPlayer.h */; }; - 15AE1B9819AADAA100C27E9E /* UIVideoPlayerIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3EA0FB6A191C841D00B170C8 /* UIVideoPlayerIOS.mm */; }; + 15AE1B9819AADAA100C27E9E /* UIVideoPlayer-ios.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3EA0FB6A191C841D00B170C8 /* UIVideoPlayer-ios.mm */; }; 15AE1B9919AADFDF00C27E9E /* UIHBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50E6D32E18E174130051CA34 /* UIHBox.cpp */; }; 15AE1B9A19AADFDF00C27E9E /* UIHBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 50E6D32F18E174130051CA34 /* UIHBox.h */; }; 15AE1B9B19AADFDF00C27E9E /* UIRelativeBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50E6D33018E174130051CA34 /* UIRelativeBox.cpp */; }; @@ -1342,20 +1342,20 @@ 292DB14019B4574100A80320 /* UIEditBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 292DB13019B4574100A80320 /* UIEditBox.h */; }; 292DB14119B4574100A80320 /* UIEditBoxImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 292DB13119B4574100A80320 /* UIEditBoxImpl.h */; }; 292DB14219B4574100A80320 /* UIEditBoxImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 292DB13119B4574100A80320 /* UIEditBoxImpl.h */; }; - 292DB14319B4574100A80320 /* UIEditBoxImplAndroid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 292DB13219B4574100A80320 /* UIEditBoxImplAndroid.cpp */; }; - 292DB14419B4574100A80320 /* UIEditBoxImplAndroid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 292DB13219B4574100A80320 /* UIEditBoxImplAndroid.cpp */; }; - 292DB14519B4574100A80320 /* UIEditBoxImplAndroid.h in Headers */ = {isa = PBXBuildFile; fileRef = 292DB13319B4574100A80320 /* UIEditBoxImplAndroid.h */; }; - 292DB14619B4574100A80320 /* UIEditBoxImplAndroid.h in Headers */ = {isa = PBXBuildFile; fileRef = 292DB13319B4574100A80320 /* UIEditBoxImplAndroid.h */; }; - 292DB14719B4574100A80320 /* UIEditBoxImplIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 292DB13419B4574100A80320 /* UIEditBoxImplIOS.h */; }; - 292DB14819B4574100A80320 /* UIEditBoxImplIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 292DB13419B4574100A80320 /* UIEditBoxImplIOS.h */; }; - 292DB14919B4574100A80320 /* UIEditBoxImplIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 292DB13519B4574100A80320 /* UIEditBoxImplIOS.mm */; }; - 292DB14A19B4574100A80320 /* UIEditBoxImplIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 292DB13519B4574100A80320 /* UIEditBoxImplIOS.mm */; }; - 292DB14B19B4574100A80320 /* UIEditBoxImplMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 292DB13619B4574100A80320 /* UIEditBoxImplMac.h */; }; - 292DB14C19B4574100A80320 /* UIEditBoxImplMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 292DB13619B4574100A80320 /* UIEditBoxImplMac.h */; }; - 292DB14D19B4574100A80320 /* UIEditBoxImplMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 292DB13719B4574100A80320 /* UIEditBoxImplMac.mm */; }; - 292DB14E19B4574100A80320 /* UIEditBoxImplMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 292DB13719B4574100A80320 /* UIEditBoxImplMac.mm */; }; - 292DB14F19B4574100A80320 /* UIEditBoxImplNone.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 292DB13819B4574100A80320 /* UIEditBoxImplNone.cpp */; }; - 292DB15019B4574100A80320 /* UIEditBoxImplNone.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 292DB13819B4574100A80320 /* UIEditBoxImplNone.cpp */; }; + 292DB14319B4574100A80320 /* UIEditBoxImpl-android.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 292DB13219B4574100A80320 /* UIEditBoxImpl-android.cpp */; }; + 292DB14419B4574100A80320 /* UIEditBoxImpl-android.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 292DB13219B4574100A80320 /* UIEditBoxImpl-android.cpp */; }; + 292DB14519B4574100A80320 /* UIEditBoxImpl-android.h in Headers */ = {isa = PBXBuildFile; fileRef = 292DB13319B4574100A80320 /* UIEditBoxImpl-android.h */; }; + 292DB14619B4574100A80320 /* UIEditBoxImpl-android.h in Headers */ = {isa = PBXBuildFile; fileRef = 292DB13319B4574100A80320 /* UIEditBoxImpl-android.h */; }; + 292DB14719B4574100A80320 /* UIEditBoxImpl-ios.h in Headers */ = {isa = PBXBuildFile; fileRef = 292DB13419B4574100A80320 /* UIEditBoxImpl-ios.h */; }; + 292DB14819B4574100A80320 /* UIEditBoxImpl-ios.h in Headers */ = {isa = PBXBuildFile; fileRef = 292DB13419B4574100A80320 /* UIEditBoxImpl-ios.h */; }; + 292DB14919B4574100A80320 /* UIEditBoxImpl-ios.mm in Sources */ = {isa = PBXBuildFile; fileRef = 292DB13519B4574100A80320 /* UIEditBoxImpl-ios.mm */; }; + 292DB14A19B4574100A80320 /* UIEditBoxImpl-ios.mm in Sources */ = {isa = PBXBuildFile; fileRef = 292DB13519B4574100A80320 /* UIEditBoxImpl-ios.mm */; }; + 292DB14B19B4574100A80320 /* UIEditBoxImpl-mac.h in Headers */ = {isa = PBXBuildFile; fileRef = 292DB13619B4574100A80320 /* UIEditBoxImpl-mac.h */; }; + 292DB14C19B4574100A80320 /* UIEditBoxImpl-mac.h in Headers */ = {isa = PBXBuildFile; fileRef = 292DB13619B4574100A80320 /* UIEditBoxImpl-mac.h */; }; + 292DB14D19B4574100A80320 /* UIEditBoxImpl-mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 292DB13719B4574100A80320 /* UIEditBoxImpl-mac.mm */; }; + 292DB14E19B4574100A80320 /* UIEditBoxImpl-mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 292DB13719B4574100A80320 /* UIEditBoxImpl-mac.mm */; }; + 292DB14F19B4574100A80320 /* UIEditBoxImpl-stub.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 292DB13819B4574100A80320 /* UIEditBoxImpl-stub.cpp */; }; + 292DB15019B4574100A80320 /* UIEditBoxImpl-stub.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 292DB13819B4574100A80320 /* UIEditBoxImpl-stub.cpp */; }; 292DB15F19B461CA00A80320 /* ExtensionDeprecated.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 292DB15D19B461CA00A80320 /* ExtensionDeprecated.cpp */; }; 292DB16019B461CA00A80320 /* ExtensionDeprecated.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 292DB15D19B461CA00A80320 /* ExtensionDeprecated.cpp */; }; 292DB16119B461CA00A80320 /* ExtensionDeprecated.h in Headers */ = {isa = PBXBuildFile; fileRef = 292DB15E19B461CA00A80320 /* ExtensionDeprecated.h */; }; @@ -1364,10 +1364,10 @@ 29394CF119B01DBA00D2DE1A /* UIWebView.h in Headers */ = {isa = PBXBuildFile; fileRef = 29394CEC19B01DBA00D2DE1A /* UIWebView.h */; }; 29394CF219B01DBA00D2DE1A /* UIWebView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 29394CED19B01DBA00D2DE1A /* UIWebView.mm */; }; 29394CF319B01DBA00D2DE1A /* UIWebView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 29394CED19B01DBA00D2DE1A /* UIWebView.mm */; }; - 29394CF419B01DBA00D2DE1A /* UIWebViewImpl_iOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 29394CEE19B01DBA00D2DE1A /* UIWebViewImpl_iOS.h */; }; - 29394CF519B01DBA00D2DE1A /* UIWebViewImpl_iOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 29394CEE19B01DBA00D2DE1A /* UIWebViewImpl_iOS.h */; }; - 29394CF619B01DBA00D2DE1A /* UIWebViewImpl_iOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 29394CEF19B01DBA00D2DE1A /* UIWebViewImpl_iOS.mm */; }; - 29394CF719B01DBA00D2DE1A /* UIWebViewImpl_iOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 29394CEF19B01DBA00D2DE1A /* UIWebViewImpl_iOS.mm */; }; + 29394CF419B01DBA00D2DE1A /* UIWebViewImpl-ios.h in Headers */ = {isa = PBXBuildFile; fileRef = 29394CEE19B01DBA00D2DE1A /* UIWebViewImpl-ios.h */; }; + 29394CF519B01DBA00D2DE1A /* UIWebViewImpl-ios.h in Headers */ = {isa = PBXBuildFile; fileRef = 29394CEE19B01DBA00D2DE1A /* UIWebViewImpl-ios.h */; }; + 29394CF619B01DBA00D2DE1A /* UIWebViewImpl-ios.mm in Sources */ = {isa = PBXBuildFile; fileRef = 29394CEF19B01DBA00D2DE1A /* UIWebViewImpl-ios.mm */; }; + 29394CF719B01DBA00D2DE1A /* UIWebViewImpl-ios.mm in Sources */ = {isa = PBXBuildFile; fileRef = 29394CEF19B01DBA00D2DE1A /* UIWebViewImpl-ios.mm */; }; 2986667F18B1B246000E39CA /* CCTweenFunction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2986667818B1B079000E39CA /* CCTweenFunction.cpp */; }; 299754F4193EC95400A54AC3 /* ObjectFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 299754F2193EC95400A54AC3 /* ObjectFactory.cpp */; }; 299754F5193EC95400A54AC3 /* ObjectFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 299754F2193EC95400A54AC3 /* ObjectFactory.cpp */; }; @@ -1455,30 +1455,38 @@ 5034CA4A191D591100CE6051 /* ccShader_Label_df.frag in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA0F191D591000CE6051 /* ccShader_Label_df.frag */; }; 5034CA4B191D591100CE6051 /* ccShader_Label_df_glow.frag in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA10191D591000CE6051 /* ccShader_Label_df_glow.frag */; }; 5034CA4C191D591100CE6051 /* ccShader_Label_df_glow.frag in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA10191D591000CE6051 /* ccShader_Label_df_glow.frag */; }; - 503DD8E01926736A00CD74DD /* CCApplication.h in Headers */ = {isa = PBXBuildFile; fileRef = 503DD8CE1926736A00CD74DD /* CCApplication.h */; }; - 503DD8E11926736A00CD74DD /* CCApplication.mm in Sources */ = {isa = PBXBuildFile; fileRef = 503DD8CF1926736A00CD74DD /* CCApplication.mm */; }; - 503DD8E21926736A00CD74DD /* CCCommon.mm in Sources */ = {isa = PBXBuildFile; fileRef = 503DD8D01926736A00CD74DD /* CCCommon.mm */; }; - 503DD8E31926736A00CD74DD /* CCDevice.mm in Sources */ = {isa = PBXBuildFile; fileRef = 503DD8D11926736A00CD74DD /* CCDevice.mm */; }; - 503DD8E41926736A00CD74DD /* CCDirectorCaller.h in Headers */ = {isa = PBXBuildFile; fileRef = 503DD8D21926736A00CD74DD /* CCDirectorCaller.h */; }; - 503DD8E51926736A00CD74DD /* CCDirectorCaller.mm in Sources */ = {isa = PBXBuildFile; fileRef = 503DD8D31926736A00CD74DD /* CCDirectorCaller.mm */; }; - 503DD8E61926736A00CD74DD /* CCEAGLView.h in Headers */ = {isa = PBXBuildFile; fileRef = 503DD8D41926736A00CD74DD /* CCEAGLView.h */; }; - 503DD8E71926736A00CD74DD /* CCEAGLView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 503DD8D51926736A00CD74DD /* CCEAGLView.mm */; }; - 503DD8E81926736A00CD74DD /* CCES2Renderer.h in Headers */ = {isa = PBXBuildFile; fileRef = 503DD8D61926736A00CD74DD /* CCES2Renderer.h */; }; - 503DD8E91926736A00CD74DD /* CCES2Renderer.m in Sources */ = {isa = PBXBuildFile; fileRef = 503DD8D71926736A00CD74DD /* CCES2Renderer.m */; }; - 503DD8EA1926736A00CD74DD /* CCESRenderer.h in Headers */ = {isa = PBXBuildFile; fileRef = 503DD8D81926736A00CD74DD /* CCESRenderer.h */; }; - 503DD8EB1926736A00CD74DD /* CCGL.h in Headers */ = {isa = PBXBuildFile; fileRef = 503DD8D91926736A00CD74DD /* CCGL.h */; }; - 503DD8EC1926736A00CD74DD /* CCGLViewImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 503DD8DA1926736A00CD74DD /* CCGLViewImpl.h */; }; - 503DD8ED1926736A00CD74DD /* CCGLViewImpl.mm in Sources */ = {isa = PBXBuildFile; fileRef = 503DD8DB1926736A00CD74DD /* CCGLViewImpl.mm */; }; - 503DD8EE1926736A00CD74DD /* CCImage.mm in Sources */ = {isa = PBXBuildFile; fileRef = 503DD8DC1926736A00CD74DD /* CCImage.mm */; }; - 503DD8EF1926736A00CD74DD /* CCPlatformDefine.h in Headers */ = {isa = PBXBuildFile; fileRef = 503DD8DD1926736A00CD74DD /* CCPlatformDefine.h */; }; - 503DD8F01926736A00CD74DD /* CCStdC.h in Headers */ = {isa = PBXBuildFile; fileRef = 503DD8DE1926736A00CD74DD /* CCStdC.h */; }; - 503DD8F11926736A00CD74DD /* OpenGL_Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 503DD8DF1926736A00CD74DD /* OpenGL_Internal.h */; }; + 503DD8E01926736A00CD74DD /* CCApplication-ios.h in Headers */ = {isa = PBXBuildFile; fileRef = 503DD8CE1926736A00CD74DD /* CCApplication-ios.h */; }; + 503DD8E11926736A00CD74DD /* CCApplication-ios.mm in Sources */ = {isa = PBXBuildFile; fileRef = 503DD8CF1926736A00CD74DD /* CCApplication-ios.mm */; }; + 503DD8E21926736A00CD74DD /* CCCommon-ios.mm in Sources */ = {isa = PBXBuildFile; fileRef = 503DD8D01926736A00CD74DD /* CCCommon-ios.mm */; }; + 503DD8E31926736A00CD74DD /* CCDevice-ios.mm in Sources */ = {isa = PBXBuildFile; fileRef = 503DD8D11926736A00CD74DD /* CCDevice-ios.mm */; }; + 503DD8E41926736A00CD74DD /* CCDirectorCaller-ios.h in Headers */ = {isa = PBXBuildFile; fileRef = 503DD8D21926736A00CD74DD /* CCDirectorCaller-ios.h */; }; + 503DD8E51926736A00CD74DD /* CCDirectorCaller-ios.mm in Sources */ = {isa = PBXBuildFile; fileRef = 503DD8D31926736A00CD74DD /* CCDirectorCaller-ios.mm */; }; + 503DD8E61926736A00CD74DD /* CCEAGLView-ios.h in Headers */ = {isa = PBXBuildFile; fileRef = 503DD8D41926736A00CD74DD /* CCEAGLView-ios.h */; }; + 503DD8E71926736A00CD74DD /* CCEAGLView-ios.mm in Sources */ = {isa = PBXBuildFile; fileRef = 503DD8D51926736A00CD74DD /* CCEAGLView-ios.mm */; }; + 503DD8E81926736A00CD74DD /* CCES2Renderer-ios.h in Headers */ = {isa = PBXBuildFile; fileRef = 503DD8D61926736A00CD74DD /* CCES2Renderer-ios.h */; }; + 503DD8E91926736A00CD74DD /* CCES2Renderer-ios.m in Sources */ = {isa = PBXBuildFile; fileRef = 503DD8D71926736A00CD74DD /* CCES2Renderer-ios.m */; }; + 503DD8EA1926736A00CD74DD /* CCESRenderer-ios.h in Headers */ = {isa = PBXBuildFile; fileRef = 503DD8D81926736A00CD74DD /* CCESRenderer-ios.h */; }; + 503DD8EB1926736A00CD74DD /* CCGL-ios.h in Headers */ = {isa = PBXBuildFile; fileRef = 503DD8D91926736A00CD74DD /* CCGL-ios.h */; }; + 503DD8EC1926736A00CD74DD /* CCGLViewImpl-ios.h in Headers */ = {isa = PBXBuildFile; fileRef = 503DD8DA1926736A00CD74DD /* CCGLViewImpl-ios.h */; }; + 503DD8ED1926736A00CD74DD /* CCGLViewImpl-ios.mm in Sources */ = {isa = PBXBuildFile; fileRef = 503DD8DB1926736A00CD74DD /* CCGLViewImpl-ios.mm */; }; + 503DD8EE1926736A00CD74DD /* CCImage-ios.mm in Sources */ = {isa = PBXBuildFile; fileRef = 503DD8DC1926736A00CD74DD /* CCImage-ios.mm */; }; + 503DD8EF1926736A00CD74DD /* CCPlatformDefine-ios.h in Headers */ = {isa = PBXBuildFile; fileRef = 503DD8DD1926736A00CD74DD /* CCPlatformDefine-ios.h */; }; + 503DD8F01926736A00CD74DD /* CCStdC-ios.h in Headers */ = {isa = PBXBuildFile; fileRef = 503DD8DE1926736A00CD74DD /* CCStdC-ios.h */; }; + 503DD8F11926736A00CD74DD /* OpenGL_Internal-ios.h in Headers */ = {isa = PBXBuildFile; fileRef = 503DD8DF1926736A00CD74DD /* OpenGL_Internal-ios.h */; }; 503DD8F51926B0DB00CD74DD /* CCIMEDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 503DD8F21926B0DB00CD74DD /* CCIMEDelegate.h */; }; 503DD8F61926B0DB00CD74DD /* CCIMEDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 503DD8F21926B0DB00CD74DD /* CCIMEDelegate.h */; }; 503DD8F71926B0DB00CD74DD /* CCIMEDispatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 503DD8F31926B0DB00CD74DD /* CCIMEDispatcher.cpp */; }; 503DD8F81926B0DB00CD74DD /* CCIMEDispatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 503DD8F31926B0DB00CD74DD /* CCIMEDispatcher.cpp */; }; 503DD8F91926B0DB00CD74DD /* CCIMEDispatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 503DD8F41926B0DB00CD74DD /* CCIMEDispatcher.h */; }; 503DD8FA1926B0DB00CD74DD /* CCIMEDispatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 503DD8F41926B0DB00CD74DD /* CCIMEDispatcher.h */; }; + 50643BD419BFAECF00EF68ED /* CCGL.h in Headers */ = {isa = PBXBuildFile; fileRef = 50643BD319BFAECF00EF68ED /* CCGL.h */; }; + 50643BD519BFAECF00EF68ED /* CCGL.h in Headers */ = {isa = PBXBuildFile; fileRef = 50643BD319BFAECF00EF68ED /* CCGL.h */; }; + 50643BD619BFAEDA00EF68ED /* CCPlatformDefine.h in Headers */ = {isa = PBXBuildFile; fileRef = 5091A7A219BFABA800AC8789 /* CCPlatformDefine.h */; }; + 50643BD919BFAF4400EF68ED /* CCApplication.h in Headers */ = {isa = PBXBuildFile; fileRef = 50643BD719BFAF4400EF68ED /* CCApplication.h */; }; + 50643BDA19BFAF4400EF68ED /* CCApplication.h in Headers */ = {isa = PBXBuildFile; fileRef = 50643BD719BFAF4400EF68ED /* CCApplication.h */; }; + 50643BDB19BFAF4400EF68ED /* CCStdC.h in Headers */ = {isa = PBXBuildFile; fileRef = 50643BD819BFAF4400EF68ED /* CCStdC.h */; }; + 50643BDC19BFAF4400EF68ED /* CCStdC.h in Headers */ = {isa = PBXBuildFile; fileRef = 50643BD819BFAF4400EF68ED /* CCStdC.h */; }; + 5091A7A319BFABA800AC8789 /* CCPlatformDefine.h in Headers */ = {isa = PBXBuildFile; fileRef = 5091A7A219BFABA800AC8789 /* CCPlatformDefine.h */; }; 50ABBD381925AB0000A911A9 /* CCAffineTransform.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD1B1925AB0000A911A9 /* CCAffineTransform.cpp */; }; 50ABBD391925AB0000A911A9 /* CCAffineTransform.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD1B1925AB0000A911A9 /* CCAffineTransform.cpp */; }; 50ABBD3A1925AB0000A911A9 /* CCAffineTransform.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD1C1925AB0000A911A9 /* CCAffineTransform.h */; }; @@ -1733,10 +1741,10 @@ 50ABBEB01925AB6F00A911A9 /* CCUserDefault.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE091925AB6E00A911A9 /* CCUserDefault.cpp */; }; 50ABBEB11925AB6F00A911A9 /* CCUserDefault.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE0A1925AB6E00A911A9 /* CCUserDefault.h */; }; 50ABBEB21925AB6F00A911A9 /* CCUserDefault.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE0A1925AB6E00A911A9 /* CCUserDefault.h */; }; - 50ABBEB31925AB6F00A911A9 /* CCUserDefault.mm in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE0B1925AB6F00A911A9 /* CCUserDefault.mm */; }; - 50ABBEB41925AB6F00A911A9 /* CCUserDefault.mm in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE0B1925AB6F00A911A9 /* CCUserDefault.mm */; }; - 50ABBEB51925AB6F00A911A9 /* CCUserDefaultAndroid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE0C1925AB6F00A911A9 /* CCUserDefaultAndroid.cpp */; }; - 50ABBEB61925AB6F00A911A9 /* CCUserDefaultAndroid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE0C1925AB6F00A911A9 /* CCUserDefaultAndroid.cpp */; }; + 50ABBEB31925AB6F00A911A9 /* CCUserDefault-apple.mm in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE0B1925AB6F00A911A9 /* CCUserDefault-apple.mm */; }; + 50ABBEB41925AB6F00A911A9 /* CCUserDefault-apple.mm in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE0B1925AB6F00A911A9 /* CCUserDefault-apple.mm */; }; + 50ABBEB51925AB6F00A911A9 /* CCUserDefault-android.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE0C1925AB6F00A911A9 /* CCUserDefault-android.cpp */; }; + 50ABBEB61925AB6F00A911A9 /* CCUserDefault-android.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE0C1925AB6F00A911A9 /* CCUserDefault-android.cpp */; }; 50ABBEB71925AB6F00A911A9 /* ccUTF8.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE0D1925AB6F00A911A9 /* ccUTF8.cpp */; }; 50ABBEB81925AB6F00A911A9 /* ccUTF8.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE0D1925AB6F00A911A9 /* ccUTF8.cpp */; }; 50ABBEB91925AB6F00A911A9 /* ccUTF8.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE0E1925AB6F00A911A9 /* ccUTF8.h */; }; @@ -1773,16 +1781,16 @@ 50ABBED81925AB6F00A911A9 /* ZipUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE1D1925AB6F00A911A9 /* ZipUtils.cpp */; }; 50ABBED91925AB6F00A911A9 /* ZipUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE1E1925AB6F00A911A9 /* ZipUtils.h */; }; 50ABBEDA1925AB6F00A911A9 /* ZipUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE1E1925AB6F00A911A9 /* ZipUtils.h */; }; - 50ABBFFD1926664800A911A9 /* CCFileUtilsApple.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF1B1926664700A911A9 /* CCFileUtilsApple.h */; }; - 50ABBFFE1926664800A911A9 /* CCFileUtilsApple.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF1B1926664700A911A9 /* CCFileUtilsApple.h */; }; - 50ABBFFF1926664800A911A9 /* CCFileUtilsApple.mm in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF1C1926664700A911A9 /* CCFileUtilsApple.mm */; }; - 50ABC0001926664800A911A9 /* CCFileUtilsApple.mm in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF1C1926664700A911A9 /* CCFileUtilsApple.mm */; }; - 50ABC0011926664800A911A9 /* CCLock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF1D1926664700A911A9 /* CCLock.cpp */; }; - 50ABC0021926664800A911A9 /* CCLock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF1D1926664700A911A9 /* CCLock.cpp */; }; - 50ABC0031926664800A911A9 /* CCLock.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF1E1926664700A911A9 /* CCLock.h */; }; - 50ABC0041926664800A911A9 /* CCLock.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF1E1926664700A911A9 /* CCLock.h */; }; - 50ABC0051926664800A911A9 /* CCThread.mm in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF1F1926664700A911A9 /* CCThread.mm */; }; - 50ABC0061926664800A911A9 /* CCThread.mm in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF1F1926664700A911A9 /* CCThread.mm */; }; + 50ABBFFD1926664800A911A9 /* CCFileUtils-apple.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF1B1926664700A911A9 /* CCFileUtils-apple.h */; }; + 50ABBFFE1926664800A911A9 /* CCFileUtils-apple.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF1B1926664700A911A9 /* CCFileUtils-apple.h */; }; + 50ABBFFF1926664800A911A9 /* CCFileUtils-apple.mm in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF1C1926664700A911A9 /* CCFileUtils-apple.mm */; }; + 50ABC0001926664800A911A9 /* CCFileUtils-apple.mm in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF1C1926664700A911A9 /* CCFileUtils-apple.mm */; }; + 50ABC0011926664800A911A9 /* CCLock-apple.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF1D1926664700A911A9 /* CCLock-apple.cpp */; }; + 50ABC0021926664800A911A9 /* CCLock-apple.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF1D1926664700A911A9 /* CCLock-apple.cpp */; }; + 50ABC0031926664800A911A9 /* CCLock-apple.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF1E1926664700A911A9 /* CCLock-apple.h */; }; + 50ABC0041926664800A911A9 /* CCLock-apple.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF1E1926664700A911A9 /* CCLock-apple.h */; }; + 50ABC0051926664800A911A9 /* CCThread-apple.mm in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF1F1926664700A911A9 /* CCThread-apple.mm */; }; + 50ABC0061926664800A911A9 /* CCThread-apple.mm in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF1F1926664700A911A9 /* CCThread-apple.mm */; }; 50ABC0071926664800A911A9 /* CCApplicationProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF201926664700A911A9 /* CCApplicationProtocol.h */; }; 50ABC0081926664800A911A9 /* CCApplicationProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF201926664700A911A9 /* CCApplicationProtocol.h */; }; 50ABC0091926664800A911A9 /* CCCommon.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF211926664700A911A9 /* CCCommon.h */; }; @@ -1809,26 +1817,26 @@ 50ABC01E1926664800A911A9 /* CCThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF2B1926664700A911A9 /* CCThread.cpp */; }; 50ABC01F1926664800A911A9 /* CCThread.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF2C1926664700A911A9 /* CCThread.h */; }; 50ABC0201926664800A911A9 /* CCThread.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF2C1926664700A911A9 /* CCThread.h */; }; - 50ABC0211926664800A911A9 /* CCGLViewImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF2E1926664700A911A9 /* CCGLViewImpl.cpp */; }; - 50ABC0231926664800A911A9 /* CCGLViewImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF2F1926664700A911A9 /* CCGLViewImpl.h */; }; - 50ABC05D1926664800A911A9 /* CCApplication.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF4F1926664700A911A9 /* CCApplication.h */; }; - 50ABC05F1926664800A911A9 /* CCApplication.mm in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF501926664700A911A9 /* CCApplication.mm */; }; - 50ABC0611926664800A911A9 /* CCCommon.mm in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF511926664700A911A9 /* CCCommon.mm */; }; - 50ABC0631926664800A911A9 /* CCDevice.mm in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF521926664700A911A9 /* CCDevice.mm */; }; - 50ABC0651926664800A911A9 /* CCGL.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF531926664700A911A9 /* CCGL.h */; }; - 50ABC0671926664800A911A9 /* CCPlatformDefine.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF541926664700A911A9 /* CCPlatformDefine.h */; }; - 50ABC0691926664800A911A9 /* CCStdC.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF551926664700A911A9 /* CCStdC.h */; }; + 50ABC0211926664800A911A9 /* CCGLViewImpl-desktop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF2E1926664700A911A9 /* CCGLViewImpl-desktop.cpp */; }; + 50ABC0231926664800A911A9 /* CCGLViewImpl-desktop.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF2F1926664700A911A9 /* CCGLViewImpl-desktop.h */; }; + 50ABC05D1926664800A911A9 /* CCApplication-mac.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF4F1926664700A911A9 /* CCApplication-mac.h */; }; + 50ABC05F1926664800A911A9 /* CCApplication-mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF501926664700A911A9 /* CCApplication-mac.mm */; }; + 50ABC0611926664800A911A9 /* CCCommon-mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF511926664700A911A9 /* CCCommon-mac.mm */; }; + 50ABC0631926664800A911A9 /* CCDevice-mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF521926664700A911A9 /* CCDevice-mac.mm */; }; + 50ABC0651926664800A911A9 /* CCGL-mac.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF531926664700A911A9 /* CCGL-mac.h */; }; + 50ABC0671926664800A911A9 /* CCPlatformDefine-mac.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF541926664700A911A9 /* CCPlatformDefine-mac.h */; }; + 50ABC0691926664800A911A9 /* CCStdC-mac.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF551926664700A911A9 /* CCStdC-mac.h */; }; 50ED2BD919BE5D5D00A0AB90 /* CCEventListenerController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E6176631960F89B00DE83F5 /* CCEventListenerController.cpp */; }; 50ED2BDA19BE76D300A0AB90 /* UIVideoPlayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 3EA0FB69191C841D00B170C8 /* UIVideoPlayer.h */; }; - 50ED2BDB19BE76D500A0AB90 /* UIVideoPlayerIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3EA0FB6A191C841D00B170C8 /* UIVideoPlayerIOS.mm */; }; - 50ED2BE019BEAF7900A0AB90 /* UIEditBoxImplWin.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ED2BDC19BEAF7900A0AB90 /* UIEditBoxImplWin.h */; }; - 50ED2BE119BEAF7900A0AB90 /* UIEditBoxImplWin.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ED2BDC19BEAF7900A0AB90 /* UIEditBoxImplWin.h */; }; - 50ED2BE219BEAF7900A0AB90 /* UIEditBoxImplWp8.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ED2BDD19BEAF7900A0AB90 /* UIEditBoxImplWp8.h */; }; - 50ED2BE319BEAF7900A0AB90 /* UIEditBoxImplWp8.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ED2BDD19BEAF7900A0AB90 /* UIEditBoxImplWp8.h */; }; - 50ED2BE419BEAF7900A0AB90 /* UIEditBoxImplWin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ED2BDE19BEAF7900A0AB90 /* UIEditBoxImplWin.cpp */; }; - 50ED2BE519BEAF7900A0AB90 /* UIEditBoxImplWin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ED2BDE19BEAF7900A0AB90 /* UIEditBoxImplWin.cpp */; }; - 50ED2BE619BEAF7900A0AB90 /* UIEditBoxImplWp8.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ED2BDF19BEAF7900A0AB90 /* UIEditBoxImplWp8.cpp */; }; - 50ED2BE719BEAF7900A0AB90 /* UIEditBoxImplWp8.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ED2BDF19BEAF7900A0AB90 /* UIEditBoxImplWp8.cpp */; }; + 50ED2BDB19BE76D500A0AB90 /* UIVideoPlayer-ios.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3EA0FB6A191C841D00B170C8 /* UIVideoPlayer-ios.mm */; }; + 50ED2BE019BEAF7900A0AB90 /* UIEditBoxImpl-win32.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ED2BDC19BEAF7900A0AB90 /* UIEditBoxImpl-win32.h */; }; + 50ED2BE119BEAF7900A0AB90 /* UIEditBoxImpl-win32.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ED2BDC19BEAF7900A0AB90 /* UIEditBoxImpl-win32.h */; }; + 50ED2BE219BEAF7900A0AB90 /* UIEditBoxImpl-wp8.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ED2BDD19BEAF7900A0AB90 /* UIEditBoxImpl-wp8.h */; }; + 50ED2BE319BEAF7900A0AB90 /* UIEditBoxImpl-wp8.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ED2BDD19BEAF7900A0AB90 /* UIEditBoxImpl-wp8.h */; }; + 50ED2BE419BEAF7900A0AB90 /* UIEditBoxImpl-win32.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ED2BDE19BEAF7900A0AB90 /* UIEditBoxImpl-win32.cpp */; }; + 50ED2BE519BEAF7900A0AB90 /* UIEditBoxImpl-win32.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ED2BDE19BEAF7900A0AB90 /* UIEditBoxImpl-win32.cpp */; }; + 50ED2BE619BEAF7900A0AB90 /* UIEditBoxImpl-wp8.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ED2BDF19BEAF7900A0AB90 /* UIEditBoxImpl-wp8.cpp */; }; + 50ED2BE719BEAF7900A0AB90 /* UIEditBoxImpl-wp8.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ED2BDF19BEAF7900A0AB90 /* UIEditBoxImpl-wp8.cpp */; }; A07A4CAF1783777C0073F6A7 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1551A342158F2AB200E66CFE /* Foundation.framework */; }; B2165EEA19921124000BE3E6 /* CCPrimitiveCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B257B45E198A353E00D9A687 /* CCPrimitiveCommand.cpp */; }; B217703C1977ECB4009EE11B /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B217703B1977ECB4009EE11B /* IOKit.framework */; }; @@ -2332,19 +2340,19 @@ 292DB12F19B4574100A80320 /* UIEditBox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UIEditBox.cpp; sourceTree = ""; }; 292DB13019B4574100A80320 /* UIEditBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIEditBox.h; sourceTree = ""; }; 292DB13119B4574100A80320 /* UIEditBoxImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIEditBoxImpl.h; sourceTree = ""; }; - 292DB13219B4574100A80320 /* UIEditBoxImplAndroid.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UIEditBoxImplAndroid.cpp; sourceTree = ""; }; - 292DB13319B4574100A80320 /* UIEditBoxImplAndroid.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIEditBoxImplAndroid.h; sourceTree = ""; }; - 292DB13419B4574100A80320 /* UIEditBoxImplIOS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIEditBoxImplIOS.h; sourceTree = ""; }; - 292DB13519B4574100A80320 /* UIEditBoxImplIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = UIEditBoxImplIOS.mm; sourceTree = ""; }; - 292DB13619B4574100A80320 /* UIEditBoxImplMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIEditBoxImplMac.h; sourceTree = ""; }; - 292DB13719B4574100A80320 /* UIEditBoxImplMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = UIEditBoxImplMac.mm; sourceTree = ""; }; - 292DB13819B4574100A80320 /* UIEditBoxImplNone.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UIEditBoxImplNone.cpp; sourceTree = ""; }; + 292DB13219B4574100A80320 /* UIEditBoxImpl-android.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "UIEditBoxImpl-android.cpp"; sourceTree = ""; }; + 292DB13319B4574100A80320 /* UIEditBoxImpl-android.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIEditBoxImpl-android.h"; sourceTree = ""; }; + 292DB13419B4574100A80320 /* UIEditBoxImpl-ios.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIEditBoxImpl-ios.h"; sourceTree = ""; }; + 292DB13519B4574100A80320 /* UIEditBoxImpl-ios.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "UIEditBoxImpl-ios.mm"; sourceTree = ""; }; + 292DB13619B4574100A80320 /* UIEditBoxImpl-mac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIEditBoxImpl-mac.h"; sourceTree = ""; }; + 292DB13719B4574100A80320 /* UIEditBoxImpl-mac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "UIEditBoxImpl-mac.mm"; sourceTree = ""; }; + 292DB13819B4574100A80320 /* UIEditBoxImpl-stub.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "UIEditBoxImpl-stub.cpp"; sourceTree = ""; }; 292DB15D19B461CA00A80320 /* ExtensionDeprecated.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ExtensionDeprecated.cpp; sourceTree = ""; }; 292DB15E19B461CA00A80320 /* ExtensionDeprecated.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExtensionDeprecated.h; sourceTree = ""; }; 29394CEC19B01DBA00D2DE1A /* UIWebView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIWebView.h; sourceTree = ""; }; 29394CED19B01DBA00D2DE1A /* UIWebView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = UIWebView.mm; sourceTree = ""; }; - 29394CEE19B01DBA00D2DE1A /* UIWebViewImpl_iOS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIWebViewImpl_iOS.h; sourceTree = ""; }; - 29394CEF19B01DBA00D2DE1A /* UIWebViewImpl_iOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = UIWebViewImpl_iOS.mm; sourceTree = ""; }; + 29394CEE19B01DBA00D2DE1A /* UIWebViewImpl-ios.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIWebViewImpl-ios.h"; sourceTree = ""; }; + 29394CEF19B01DBA00D2DE1A /* UIWebViewImpl-ios.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "UIWebViewImpl-ios.mm"; sourceTree = ""; }; 2958244919873D8E00F9746D /* UIScale9Sprite.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UIScale9Sprite.cpp; sourceTree = ""; }; 2958244A19873D8E00F9746D /* UIScale9Sprite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIScale9Sprite.h; sourceTree = ""; }; 2986667818B1B079000E39CA /* CCTweenFunction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCTweenFunction.cpp; sourceTree = ""; }; @@ -2386,7 +2394,7 @@ 3E6176651960F89B00DE83F5 /* CCGameController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCGameController.h; path = ../base/CCGameController.h; sourceTree = ""; }; 3E61781C1966A5A300DE83F5 /* CCController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCController.cpp; path = ../base/CCController.cpp; sourceTree = ""; }; 3EA0FB69191C841D00B170C8 /* UIVideoPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIVideoPlayer.h; sourceTree = ""; }; - 3EA0FB6A191C841D00B170C8 /* UIVideoPlayerIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = UIVideoPlayerIOS.mm; sourceTree = ""; }; + 3EA0FB6A191C841D00B170C8 /* UIVideoPlayer-ios.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "UIVideoPlayer-ios.mm"; sourceTree = ""; }; 3EA3EDBA1991CDFA00645534 /* CCCamera.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCCamera.cpp; path = ../base/CCCamera.cpp; sourceTree = ""; }; 3EA3EDBB1991CDFA00645534 /* CCCamera.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCCamera.h; path = ../base/CCCamera.h; sourceTree = ""; }; 464AD6E3197EBB1400E502D8 /* pvr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = pvr.cpp; path = ../base/pvr.cpp; sourceTree = ""; }; @@ -2632,27 +2640,31 @@ 5034CA61191D91CF00CE6051 /* ccShader_PositionTextureColor.frag */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.glsl; path = ccShader_PositionTextureColor.frag; sourceTree = ""; }; 5034CA62191D91CF00CE6051 /* ccShader_PositionTextureColor_noMVP.vert */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.glsl; path = ccShader_PositionTextureColor_noMVP.vert; sourceTree = ""; }; 5034CA63191D91CF00CE6051 /* ccShader_PositionTextureColor_noMVP.frag */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.glsl; path = ccShader_PositionTextureColor_noMVP.frag; sourceTree = ""; }; - 503DD8CE1926736A00CD74DD /* CCApplication.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCApplication.h; sourceTree = ""; }; - 503DD8CF1926736A00CD74DD /* CCApplication.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CCApplication.mm; sourceTree = ""; }; - 503DD8D01926736A00CD74DD /* CCCommon.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CCCommon.mm; sourceTree = ""; }; - 503DD8D11926736A00CD74DD /* CCDevice.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CCDevice.mm; sourceTree = ""; }; - 503DD8D21926736A00CD74DD /* CCDirectorCaller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCDirectorCaller.h; sourceTree = ""; }; - 503DD8D31926736A00CD74DD /* CCDirectorCaller.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CCDirectorCaller.mm; sourceTree = ""; }; - 503DD8D41926736A00CD74DD /* CCEAGLView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEAGLView.h; sourceTree = ""; }; - 503DD8D51926736A00CD74DD /* CCEAGLView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CCEAGLView.mm; sourceTree = ""; }; - 503DD8D61926736A00CD74DD /* CCES2Renderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCES2Renderer.h; sourceTree = ""; }; - 503DD8D71926736A00CD74DD /* CCES2Renderer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCES2Renderer.m; sourceTree = ""; }; - 503DD8D81926736A00CD74DD /* CCESRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCESRenderer.h; sourceTree = ""; }; - 503DD8D91926736A00CD74DD /* CCGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGL.h; sourceTree = ""; }; - 503DD8DA1926736A00CD74DD /* CCGLViewImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGLViewImpl.h; sourceTree = ""; }; - 503DD8DB1926736A00CD74DD /* CCGLViewImpl.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CCGLViewImpl.mm; sourceTree = ""; }; - 503DD8DC1926736A00CD74DD /* CCImage.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CCImage.mm; sourceTree = ""; }; - 503DD8DD1926736A00CD74DD /* CCPlatformDefine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCPlatformDefine.h; sourceTree = ""; }; - 503DD8DE1926736A00CD74DD /* CCStdC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCStdC.h; sourceTree = ""; }; - 503DD8DF1926736A00CD74DD /* OpenGL_Internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OpenGL_Internal.h; sourceTree = ""; }; + 503DD8CE1926736A00CD74DD /* CCApplication-ios.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CCApplication-ios.h"; sourceTree = ""; }; + 503DD8CF1926736A00CD74DD /* CCApplication-ios.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "CCApplication-ios.mm"; sourceTree = ""; }; + 503DD8D01926736A00CD74DD /* CCCommon-ios.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "CCCommon-ios.mm"; sourceTree = ""; }; + 503DD8D11926736A00CD74DD /* CCDevice-ios.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "CCDevice-ios.mm"; sourceTree = ""; }; + 503DD8D21926736A00CD74DD /* CCDirectorCaller-ios.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CCDirectorCaller-ios.h"; sourceTree = ""; }; + 503DD8D31926736A00CD74DD /* CCDirectorCaller-ios.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "CCDirectorCaller-ios.mm"; sourceTree = ""; }; + 503DD8D41926736A00CD74DD /* CCEAGLView-ios.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CCEAGLView-ios.h"; sourceTree = ""; }; + 503DD8D51926736A00CD74DD /* CCEAGLView-ios.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "CCEAGLView-ios.mm"; sourceTree = ""; }; + 503DD8D61926736A00CD74DD /* CCES2Renderer-ios.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CCES2Renderer-ios.h"; sourceTree = ""; }; + 503DD8D71926736A00CD74DD /* CCES2Renderer-ios.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "CCES2Renderer-ios.m"; sourceTree = ""; }; + 503DD8D81926736A00CD74DD /* CCESRenderer-ios.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CCESRenderer-ios.h"; sourceTree = ""; }; + 503DD8D91926736A00CD74DD /* CCGL-ios.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CCGL-ios.h"; sourceTree = ""; }; + 503DD8DA1926736A00CD74DD /* CCGLViewImpl-ios.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CCGLViewImpl-ios.h"; sourceTree = ""; }; + 503DD8DB1926736A00CD74DD /* CCGLViewImpl-ios.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "CCGLViewImpl-ios.mm"; sourceTree = ""; }; + 503DD8DC1926736A00CD74DD /* CCImage-ios.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "CCImage-ios.mm"; sourceTree = ""; }; + 503DD8DD1926736A00CD74DD /* CCPlatformDefine-ios.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CCPlatformDefine-ios.h"; sourceTree = ""; }; + 503DD8DE1926736A00CD74DD /* CCStdC-ios.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CCStdC-ios.h"; sourceTree = ""; }; + 503DD8DF1926736A00CD74DD /* OpenGL_Internal-ios.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "OpenGL_Internal-ios.h"; sourceTree = ""; }; 503DD8F21926B0DB00CD74DD /* CCIMEDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCIMEDelegate.h; path = ../base/CCIMEDelegate.h; sourceTree = ""; }; 503DD8F31926B0DB00CD74DD /* CCIMEDispatcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCIMEDispatcher.cpp; path = ../base/CCIMEDispatcher.cpp; sourceTree = ""; }; 503DD8F41926B0DB00CD74DD /* CCIMEDispatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCIMEDispatcher.h; path = ../base/CCIMEDispatcher.h; sourceTree = ""; }; + 50643BD319BFAECF00EF68ED /* CCGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGL.h; sourceTree = ""; }; + 50643BD719BFAF4400EF68ED /* CCApplication.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCApplication.h; sourceTree = ""; }; + 50643BD819BFAF4400EF68ED /* CCStdC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCStdC.h; sourceTree = ""; }; + 5091A7A219BFABA800AC8789 /* CCPlatformDefine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCPlatformDefine.h; sourceTree = ""; }; 50ABBD1B1925AB0000A911A9 /* CCAffineTransform.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCAffineTransform.cpp; sourceTree = ""; }; 50ABBD1C1925AB0000A911A9 /* CCAffineTransform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCAffineTransform.h; sourceTree = ""; }; 50ABBD1D1925AB0000A911A9 /* CCGeometry.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCGeometry.cpp; sourceTree = ""; }; @@ -2787,8 +2799,8 @@ 50ABBE081925AB6E00A911A9 /* ccTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ccTypes.h; path = ../base/ccTypes.h; sourceTree = ""; }; 50ABBE091925AB6E00A911A9 /* CCUserDefault.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCUserDefault.cpp; path = ../base/CCUserDefault.cpp; sourceTree = ""; }; 50ABBE0A1925AB6E00A911A9 /* CCUserDefault.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCUserDefault.h; path = ../base/CCUserDefault.h; sourceTree = ""; }; - 50ABBE0B1925AB6F00A911A9 /* CCUserDefault.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = CCUserDefault.mm; path = ../base/CCUserDefault.mm; sourceTree = ""; }; - 50ABBE0C1925AB6F00A911A9 /* CCUserDefaultAndroid.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCUserDefaultAndroid.cpp; path = ../base/CCUserDefaultAndroid.cpp; sourceTree = ""; }; + 50ABBE0B1925AB6F00A911A9 /* CCUserDefault-apple.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = "CCUserDefault-apple.mm"; path = "../base/CCUserDefault-apple.mm"; sourceTree = ""; }; + 50ABBE0C1925AB6F00A911A9 /* CCUserDefault-android.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "CCUserDefault-android.cpp"; path = "../base/CCUserDefault-android.cpp"; sourceTree = ""; }; 50ABBE0D1925AB6F00A911A9 /* ccUTF8.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ccUTF8.cpp; path = ../base/ccUTF8.cpp; sourceTree = ""; }; 50ABBE0E1925AB6F00A911A9 /* ccUTF8.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ccUTF8.h; path = ../base/ccUTF8.h; sourceTree = ""; }; 50ABBE0F1925AB6F00A911A9 /* ccUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ccUtils.cpp; path = ../base/ccUtils.cpp; sourceTree = ""; }; @@ -2807,11 +2819,11 @@ 50ABBE1C1925AB6F00A911A9 /* utlist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = utlist.h; path = ../base/utlist.h; sourceTree = ""; }; 50ABBE1D1925AB6F00A911A9 /* ZipUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ZipUtils.cpp; path = ../base/ZipUtils.cpp; sourceTree = ""; }; 50ABBE1E1925AB6F00A911A9 /* ZipUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ZipUtils.h; path = ../base/ZipUtils.h; sourceTree = ""; }; - 50ABBF1B1926664700A911A9 /* CCFileUtilsApple.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCFileUtilsApple.h; sourceTree = ""; }; - 50ABBF1C1926664700A911A9 /* CCFileUtilsApple.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CCFileUtilsApple.mm; sourceTree = ""; }; - 50ABBF1D1926664700A911A9 /* CCLock.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCLock.cpp; sourceTree = ""; }; - 50ABBF1E1926664700A911A9 /* CCLock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCLock.h; sourceTree = ""; }; - 50ABBF1F1926664700A911A9 /* CCThread.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CCThread.mm; sourceTree = ""; }; + 50ABBF1B1926664700A911A9 /* CCFileUtils-apple.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CCFileUtils-apple.h"; sourceTree = ""; }; + 50ABBF1C1926664700A911A9 /* CCFileUtils-apple.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "CCFileUtils-apple.mm"; sourceTree = ""; }; + 50ABBF1D1926664700A911A9 /* CCLock-apple.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "CCLock-apple.cpp"; sourceTree = ""; }; + 50ABBF1E1926664700A911A9 /* CCLock-apple.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CCLock-apple.h"; sourceTree = ""; }; + 50ABBF1F1926664700A911A9 /* CCThread-apple.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "CCThread-apple.mm"; sourceTree = ""; }; 50ABBF201926664700A911A9 /* CCApplicationProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCApplicationProtocol.h; sourceTree = ""; }; 50ABBF211926664700A911A9 /* CCCommon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCCommon.h; sourceTree = ""; }; 50ABBF221926664700A911A9 /* CCDevice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCDevice.h; sourceTree = ""; }; @@ -2825,15 +2837,15 @@ 50ABBF2A1926664700A911A9 /* CCSAXParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCSAXParser.h; sourceTree = ""; }; 50ABBF2B1926664700A911A9 /* CCThread.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCThread.cpp; sourceTree = ""; }; 50ABBF2C1926664700A911A9 /* CCThread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCThread.h; sourceTree = ""; }; - 50ABBF2E1926664700A911A9 /* CCGLViewImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCGLViewImpl.cpp; sourceTree = ""; }; - 50ABBF2F1926664700A911A9 /* CCGLViewImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGLViewImpl.h; sourceTree = ""; }; - 50ABBF4F1926664700A911A9 /* CCApplication.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCApplication.h; sourceTree = ""; }; - 50ABBF501926664700A911A9 /* CCApplication.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CCApplication.mm; sourceTree = ""; }; - 50ABBF511926664700A911A9 /* CCCommon.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CCCommon.mm; sourceTree = ""; }; - 50ABBF521926664700A911A9 /* CCDevice.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CCDevice.mm; sourceTree = ""; }; - 50ABBF531926664700A911A9 /* CCGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGL.h; sourceTree = ""; }; - 50ABBF541926664700A911A9 /* CCPlatformDefine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCPlatformDefine.h; sourceTree = ""; }; - 50ABBF551926664700A911A9 /* CCStdC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCStdC.h; sourceTree = ""; }; + 50ABBF2E1926664700A911A9 /* CCGLViewImpl-desktop.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "CCGLViewImpl-desktop.cpp"; sourceTree = ""; }; + 50ABBF2F1926664700A911A9 /* CCGLViewImpl-desktop.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CCGLViewImpl-desktop.h"; sourceTree = ""; }; + 50ABBF4F1926664700A911A9 /* CCApplication-mac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CCApplication-mac.h"; sourceTree = ""; }; + 50ABBF501926664700A911A9 /* CCApplication-mac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "CCApplication-mac.mm"; sourceTree = ""; }; + 50ABBF511926664700A911A9 /* CCCommon-mac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "CCCommon-mac.mm"; sourceTree = ""; }; + 50ABBF521926664700A911A9 /* CCDevice-mac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "CCDevice-mac.mm"; sourceTree = ""; }; + 50ABBF531926664700A911A9 /* CCGL-mac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CCGL-mac.h"; sourceTree = ""; }; + 50ABBF541926664700A911A9 /* CCPlatformDefine-mac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CCPlatformDefine-mac.h"; sourceTree = ""; }; + 50ABBF551926664700A911A9 /* CCStdC-mac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CCStdC-mac.h"; sourceTree = ""; }; 50DC5180187B817900A9C23F /* RELEASE_NOTES.md */ = {isa = PBXFileReference; lastKnownFileType = text; name = RELEASE_NOTES.md; path = ../docs/RELEASE_NOTES.md; sourceTree = ""; }; 50E6D32E18E174130051CA34 /* UIHBox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UIHBox.cpp; sourceTree = ""; }; 50E6D32F18E174130051CA34 /* UIHBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIHBox.h; sourceTree = ""; }; @@ -2841,10 +2853,10 @@ 50E6D33118E174130051CA34 /* UIRelativeBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIRelativeBox.h; sourceTree = ""; }; 50E6D33218E174130051CA34 /* UIVBox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UIVBox.cpp; sourceTree = ""; }; 50E6D33318E174130051CA34 /* UIVBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIVBox.h; sourceTree = ""; }; - 50ED2BDC19BEAF7900A0AB90 /* UIEditBoxImplWin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIEditBoxImplWin.h; sourceTree = ""; }; - 50ED2BDD19BEAF7900A0AB90 /* UIEditBoxImplWp8.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIEditBoxImplWp8.h; sourceTree = ""; }; - 50ED2BDE19BEAF7900A0AB90 /* UIEditBoxImplWin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UIEditBoxImplWin.cpp; sourceTree = ""; }; - 50ED2BDF19BEAF7900A0AB90 /* UIEditBoxImplWp8.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UIEditBoxImplWp8.cpp; sourceTree = ""; }; + 50ED2BDC19BEAF7900A0AB90 /* UIEditBoxImpl-win32.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIEditBoxImpl-win32.h"; sourceTree = ""; }; + 50ED2BDD19BEAF7900A0AB90 /* UIEditBoxImpl-wp8.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIEditBoxImpl-wp8.h"; sourceTree = ""; }; + 50ED2BDE19BEAF7900A0AB90 /* UIEditBoxImpl-win32.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "UIEditBoxImpl-win32.cpp"; sourceTree = ""; }; + 50ED2BDF19BEAF7900A0AB90 /* UIEditBoxImpl-wp8.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "UIEditBoxImpl-wp8.cpp"; sourceTree = ""; }; 50FCEB6A18C72017004AD434 /* ButtonReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ButtonReader.cpp; sourceTree = ""; }; 50FCEB6B18C72017004AD434 /* ButtonReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ButtonReader.h; sourceTree = ""; }; 50FCEB6D18C72017004AD434 /* CheckBoxReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CheckBoxReader.cpp; sourceTree = ""; }; @@ -3211,8 +3223,8 @@ 50ABBE081925AB6E00A911A9 /* ccTypes.h */, 50ABBE091925AB6E00A911A9 /* CCUserDefault.cpp */, 50ABBE0A1925AB6E00A911A9 /* CCUserDefault.h */, - 50ABBE0B1925AB6F00A911A9 /* CCUserDefault.mm */, - 50ABBE0C1925AB6F00A911A9 /* CCUserDefaultAndroid.cpp */, + 50ABBE0B1925AB6F00A911A9 /* CCUserDefault-apple.mm */, + 50ABBE0C1925AB6F00A911A9 /* CCUserDefault-android.cpp */, 50ABBE0D1925AB6F00A911A9 /* ccUTF8.cpp */, 50ABBE0E1925AB6F00A911A9 /* ccUTF8.h */, 50ABBE0F1925AB6F00A911A9 /* ccUtils.cpp */, @@ -4011,20 +4023,20 @@ 292DB12E19B4574100A80320 /* UIEditBox */ = { isa = PBXGroup; children = ( - 50ED2BDC19BEAF7900A0AB90 /* UIEditBoxImplWin.h */, - 50ED2BDD19BEAF7900A0AB90 /* UIEditBoxImplWp8.h */, - 50ED2BDE19BEAF7900A0AB90 /* UIEditBoxImplWin.cpp */, - 50ED2BDF19BEAF7900A0AB90 /* UIEditBoxImplWp8.cpp */, + 50ED2BDC19BEAF7900A0AB90 /* UIEditBoxImpl-win32.h */, + 50ED2BDD19BEAF7900A0AB90 /* UIEditBoxImpl-wp8.h */, + 50ED2BDE19BEAF7900A0AB90 /* UIEditBoxImpl-win32.cpp */, + 50ED2BDF19BEAF7900A0AB90 /* UIEditBoxImpl-wp8.cpp */, 292DB12F19B4574100A80320 /* UIEditBox.cpp */, 292DB13019B4574100A80320 /* UIEditBox.h */, 292DB13119B4574100A80320 /* UIEditBoxImpl.h */, - 292DB13219B4574100A80320 /* UIEditBoxImplAndroid.cpp */, - 292DB13319B4574100A80320 /* UIEditBoxImplAndroid.h */, - 292DB13419B4574100A80320 /* UIEditBoxImplIOS.h */, - 292DB13519B4574100A80320 /* UIEditBoxImplIOS.mm */, - 292DB13619B4574100A80320 /* UIEditBoxImplMac.h */, - 292DB13719B4574100A80320 /* UIEditBoxImplMac.mm */, - 292DB13819B4574100A80320 /* UIEditBoxImplNone.cpp */, + 292DB13219B4574100A80320 /* UIEditBoxImpl-android.cpp */, + 292DB13319B4574100A80320 /* UIEditBoxImpl-android.h */, + 292DB13419B4574100A80320 /* UIEditBoxImpl-ios.h */, + 292DB13519B4574100A80320 /* UIEditBoxImpl-ios.mm */, + 292DB13619B4574100A80320 /* UIEditBoxImpl-mac.h */, + 292DB13719B4574100A80320 /* UIEditBoxImpl-mac.mm */, + 292DB13819B4574100A80320 /* UIEditBoxImpl-stub.cpp */, ); path = UIEditBox; sourceTree = ""; @@ -4069,10 +4081,10 @@ children = ( 29394CEC19B01DBA00D2DE1A /* UIWebView.h */, 29394CED19B01DBA00D2DE1A /* UIWebView.mm */, - 29394CEE19B01DBA00D2DE1A /* UIWebViewImpl_iOS.h */, - 29394CEF19B01DBA00D2DE1A /* UIWebViewImpl_iOS.mm */, + 29394CEE19B01DBA00D2DE1A /* UIWebViewImpl-ios.h */, + 29394CEF19B01DBA00D2DE1A /* UIWebViewImpl-ios.mm */, 3EA0FB69191C841D00B170C8 /* UIVideoPlayer.h */, - 3EA0FB6A191C841D00B170C8 /* UIVideoPlayerIOS.mm */, + 3EA0FB6A191C841D00B170C8 /* UIVideoPlayer-ios.mm */, ); name = experimental; sourceTree = ""; @@ -4700,24 +4712,24 @@ 503DD8CD1926736A00CD74DD /* ios */ = { isa = PBXGroup; children = ( - 503DD8CE1926736A00CD74DD /* CCApplication.h */, - 503DD8CF1926736A00CD74DD /* CCApplication.mm */, - 503DD8D01926736A00CD74DD /* CCCommon.mm */, - 503DD8D11926736A00CD74DD /* CCDevice.mm */, - 503DD8D21926736A00CD74DD /* CCDirectorCaller.h */, - 503DD8D31926736A00CD74DD /* CCDirectorCaller.mm */, - 503DD8D41926736A00CD74DD /* CCEAGLView.h */, - 503DD8D51926736A00CD74DD /* CCEAGLView.mm */, - 503DD8D61926736A00CD74DD /* CCES2Renderer.h */, - 503DD8D71926736A00CD74DD /* CCES2Renderer.m */, - 503DD8D81926736A00CD74DD /* CCESRenderer.h */, - 503DD8D91926736A00CD74DD /* CCGL.h */, - 503DD8DA1926736A00CD74DD /* CCGLViewImpl.h */, - 503DD8DB1926736A00CD74DD /* CCGLViewImpl.mm */, - 503DD8DC1926736A00CD74DD /* CCImage.mm */, - 503DD8DD1926736A00CD74DD /* CCPlatformDefine.h */, - 503DD8DE1926736A00CD74DD /* CCStdC.h */, - 503DD8DF1926736A00CD74DD /* OpenGL_Internal.h */, + 503DD8CE1926736A00CD74DD /* CCApplication-ios.h */, + 503DD8CF1926736A00CD74DD /* CCApplication-ios.mm */, + 503DD8D01926736A00CD74DD /* CCCommon-ios.mm */, + 503DD8D11926736A00CD74DD /* CCDevice-ios.mm */, + 503DD8D21926736A00CD74DD /* CCDirectorCaller-ios.h */, + 503DD8D31926736A00CD74DD /* CCDirectorCaller-ios.mm */, + 503DD8D41926736A00CD74DD /* CCEAGLView-ios.h */, + 503DD8D51926736A00CD74DD /* CCEAGLView-ios.mm */, + 503DD8D61926736A00CD74DD /* CCES2Renderer-ios.h */, + 503DD8D71926736A00CD74DD /* CCES2Renderer-ios.m */, + 503DD8D81926736A00CD74DD /* CCESRenderer-ios.h */, + 503DD8D91926736A00CD74DD /* CCGL-ios.h */, + 503DD8DA1926736A00CD74DD /* CCGLViewImpl-ios.h */, + 503DD8DB1926736A00CD74DD /* CCGLViewImpl-ios.mm */, + 503DD8DC1926736A00CD74DD /* CCImage-ios.mm */, + 503DD8DD1926736A00CD74DD /* CCPlatformDefine-ios.h */, + 503DD8DE1926736A00CD74DD /* CCStdC-ios.h */, + 503DD8DF1926736A00CD74DD /* OpenGL_Internal-ios.h */, ); path = ios; sourceTree = ""; @@ -4729,6 +4741,10 @@ 50ABBF2D1926664700A911A9 /* desktop */, 50ABBF4E1926664700A911A9 /* mac */, 50ABBF1A1926664700A911A9 /* apple */, + 5091A7A219BFABA800AC8789 /* CCPlatformDefine.h */, + 50643BD319BFAECF00EF68ED /* CCGL.h */, + 50643BD719BFAF4400EF68ED /* CCApplication.h */, + 50643BD819BFAF4400EF68ED /* CCStdC.h */, 50ABBF201926664700A911A9 /* CCApplicationProtocol.h */, 50ABBF211926664700A911A9 /* CCCommon.h */, 50ABBF221926664700A911A9 /* CCDevice.h */, @@ -4750,11 +4766,11 @@ 50ABBF1A1926664700A911A9 /* apple */ = { isa = PBXGroup; children = ( - 50ABBF1B1926664700A911A9 /* CCFileUtilsApple.h */, - 50ABBF1C1926664700A911A9 /* CCFileUtilsApple.mm */, - 50ABBF1D1926664700A911A9 /* CCLock.cpp */, - 50ABBF1E1926664700A911A9 /* CCLock.h */, - 50ABBF1F1926664700A911A9 /* CCThread.mm */, + 50ABBF1B1926664700A911A9 /* CCFileUtils-apple.h */, + 50ABBF1C1926664700A911A9 /* CCFileUtils-apple.mm */, + 50ABBF1D1926664700A911A9 /* CCLock-apple.cpp */, + 50ABBF1E1926664700A911A9 /* CCLock-apple.h */, + 50ABBF1F1926664700A911A9 /* CCThread-apple.mm */, ); path = apple; sourceTree = ""; @@ -4762,8 +4778,8 @@ 50ABBF2D1926664700A911A9 /* desktop */ = { isa = PBXGroup; children = ( - 50ABBF2E1926664700A911A9 /* CCGLViewImpl.cpp */, - 50ABBF2F1926664700A911A9 /* CCGLViewImpl.h */, + 50ABBF2E1926664700A911A9 /* CCGLViewImpl-desktop.cpp */, + 50ABBF2F1926664700A911A9 /* CCGLViewImpl-desktop.h */, ); path = desktop; sourceTree = ""; @@ -4771,13 +4787,13 @@ 50ABBF4E1926664700A911A9 /* mac */ = { isa = PBXGroup; children = ( - 50ABBF4F1926664700A911A9 /* CCApplication.h */, - 50ABBF501926664700A911A9 /* CCApplication.mm */, - 50ABBF511926664700A911A9 /* CCCommon.mm */, - 50ABBF521926664700A911A9 /* CCDevice.mm */, - 50ABBF531926664700A911A9 /* CCGL.h */, - 50ABBF541926664700A911A9 /* CCPlatformDefine.h */, - 50ABBF551926664700A911A9 /* CCStdC.h */, + 50ABBF4F1926664700A911A9 /* CCApplication-mac.h */, + 50ABBF501926664700A911A9 /* CCApplication-mac.mm */, + 50ABBF511926664700A911A9 /* CCCommon-mac.mm */, + 50ABBF521926664700A911A9 /* CCDevice-mac.mm */, + 50ABBF531926664700A911A9 /* CCGL-mac.h */, + 50ABBF541926664700A911A9 /* CCPlatformDefine-mac.h */, + 50ABBF551926664700A911A9 /* CCStdC-mac.h */, ); path = mac; sourceTree = ""; @@ -4976,17 +4992,18 @@ 50ABBE851925AB6F00A911A9 /* ccFPSImages.h in Headers */, 15AE1A5319AAD40300C27E9E /* b2Draw.h in Headers */, 5034CA39191D591100CE6051 /* ccShader_PositionColorLengthTexture.frag in Headers */, - 292DB14B19B4574100A80320 /* UIEditBoxImplMac.h in Headers */, + 292DB14B19B4574100A80320 /* UIEditBoxImpl-mac.h in Headers */, 50ABBE891925AB6F00A911A9 /* CCMap.h in Headers */, 50ABBE8D1925AB6F00A911A9 /* CCNS.h in Headers */, 50ABBEA51925AB6F00A911A9 /* CCScriptSupport.h in Headers */, - 292DB14519B4574100A80320 /* UIEditBoxImplAndroid.h in Headers */, + 292DB14519B4574100A80320 /* UIEditBoxImpl-android.h in Headers */, 15AE1B9A19AADFDF00C27E9E /* UIHBox.h in Headers */, 15AE18EB19AAD35000C27E9E /* CCActionNode.h in Headers */, 15AE1A3819AAD3D500C27E9E /* b2Shape.h in Headers */, 15AE18FC19AAD35000C27E9E /* CCComBase.h in Headers */, 1ABA68B01888D700007D1BB4 /* CCFontCharMap.h in Headers */, 15AE1B5219AADA9900C27E9E /* UIPageView.h in Headers */, + 5091A7A319BFABA800AC8789 /* CCPlatformDefine.h in Headers */, 5034CA3F191D591100CE6051 /* ccShader_Position_uColor.vert in Headers */, 50ABBD461925AB0000A911A9 /* CCVertex.h in Headers */, 15AE180A19AAD2F700C27E9E /* CCAABB.h in Headers */, @@ -5074,11 +5091,11 @@ 1A570093180BC5A10088DEC7 /* CCActionTween.h in Headers */, 50ABBD4A1925AB0000A911A9 /* Mat4.h in Headers */, 15AE1A6919AAD40300C27E9E /* b2WorldCallbacks.h in Headers */, - 29394CF419B01DBA00D2DE1A /* UIWebViewImpl_iOS.h in Headers */, + 29394CF419B01DBA00D2DE1A /* UIWebViewImpl-ios.h in Headers */, 1A57009A180BC5C10088DEC7 /* CCAtlasNode.h in Headers */, 15AE190819AAD35000C27E9E /* CCDatas.h in Headers */, 1A5700A0180BC5D20088DEC7 /* CCNode.h in Headers */, - 50ABC0671926664800A911A9 /* CCPlatformDefine.h in Headers */, + 50ABC0671926664800A911A9 /* CCPlatformDefine-mac.h in Headers */, 15AE189A19AAD33D00C27E9E /* CCMenuLoader.h in Headers */, 46C02E0918E91123004B7456 /* xxhash.h in Headers */, 15AE1A6B19AAD40300C27E9E /* b2ChainAndCircleContact.h in Headers */, @@ -5090,7 +5107,7 @@ 15AE188319AAD33D00C27E9E /* CCBSelectorResolver.h in Headers */, 15AE1B5819AADA9900C27E9E /* UISlider.h in Headers */, 1A57011D180BC90D0088DEC7 /* CCGrabber.h in Headers */, - 50ED2BE219BEAF7900A0AB90 /* UIEditBoxImplWp8.h in Headers */, + 50ED2BE219BEAF7900A0AB90 /* UIEditBoxImpl-wp8.h in Headers */, 15AE1B6819AADA9900C27E9E /* UIScale9Sprite.h in Headers */, 1A570121180BC90D0088DEC7 /* CCGrid.h in Headers */, 5034CA2D191D591100CE6051 /* ccShader_PositionTextureA8Color.frag in Headers */, @@ -5116,7 +5133,7 @@ 5034CA47191D591100CE6051 /* ccShader_Label_normal.frag in Headers */, 15AE182219AAD2F700C27E9E /* CCBundleReader.h in Headers */, 15AE18A519AAD33D00C27E9E /* CCScale9SpriteLoader.h in Headers */, - 50ED2BE019BEAF7900A0AB90 /* UIEditBoxImplWin.h in Headers */, + 50ED2BE019BEAF7900A0AB90 /* UIEditBoxImpl-win32.h in Headers */, 15AE197119AAD35700C27E9E /* CCFrame.h in Headers */, 15AE1A6519AAD40300C27E9E /* b2TimeStep.h in Headers */, 15AE182E19AAD2F700C27E9E /* CCMeshVertexIndexData.h in Headers */, @@ -5133,6 +5150,7 @@ 15AE1AEF19AAD42500C27E9E /* cpBody.h in Headers */, 50ABBED91925AB6F00A911A9 /* ZipUtils.h in Headers */, 15AE1AF119AAD42500C27E9E /* cpShape.h in Headers */, + 50643BDB19BFAF4400EF68ED /* CCStdC.h in Headers */, 1A5701C3180BCB5A0088DEC7 /* CCLabelBMFont.h in Headers */, 50ABBE5F1925AB6F00A911A9 /* CCEventListener.h in Headers */, 15AE197519AAD35700C27E9E /* CCTimeLine.h in Headers */, @@ -5221,7 +5239,7 @@ 15AE18FB19AAD35000C27E9E /* CCColliderDetector.h in Headers */, 15AE19E119AAD3A700C27E9E /* Skeleton.h in Headers */, 1A570280180BCC900088DEC7 /* CCSprite.h in Headers */, - 292DB14719B4574100A80320 /* UIEditBoxImplIOS.h in Headers */, + 292DB14719B4574100A80320 /* UIEditBoxImpl-ios.h in Headers */, 15AE1A9119AAD40300C27E9E /* b2WeldJoint.h in Headers */, 15AE1A5419AAD40300C27E9E /* b2GrowableStack.h in Headers */, 15AE1B4E19AADA9900C27E9E /* UIListView.h in Headers */, @@ -5241,7 +5259,7 @@ 50ABBD421925AB0000A911A9 /* CCMathBase.h in Headers */, 1A570298180BCCAB0088DEC7 /* CCAnimationCache.h in Headers */, 50ABBE911925AB6F00A911A9 /* CCPlatformMacros.h in Headers */, - 50ABC05D1926664800A911A9 /* CCApplication.h in Headers */, + 50ABC05D1926664800A911A9 /* CCApplication-mac.h in Headers */, 15AE190019AAD35000C27E9E /* CCComAudio.h in Headers */, 15AE190419AAD35000C27E9E /* CCComRender.h in Headers */, 15AE18AA19AAD33D00C27E9E /* CocosBuilder.h in Headers */, @@ -5295,7 +5313,8 @@ 50ABBD851925AB4100A911A9 /* CCBatchCommand.h in Headers */, 15AE1A6F19AAD40300C27E9E /* b2CircleContact.h in Headers */, 15AE191619AAD35000C27E9E /* CCSkin.h in Headers */, - 50ABC0651926664800A911A9 /* CCGL.h in Headers */, + 50ABC0651926664800A911A9 /* CCGL-mac.h in Headers */, + 50643BD419BFAECF00EF68ED /* CCGL.h in Headers */, 15AE190C19AAD35000C27E9E /* CCDisplayFactory.h in Headers */, B37510751823AC9F00B3BA6A /* CCPhysicsHelper_chipmunk.h in Headers */, 15AE1A8B19AAD40300C27E9E /* b2PulleyJoint.h in Headers */, @@ -5359,6 +5378,7 @@ 15AE197319AAD35700C27E9E /* CCNodeReader.h in Headers */, 15AE1BCF19AAE01E00C27E9E /* CCControlExtensions.h in Headers */, 15AE1A3519AAD3D500C27E9E /* b2EdgeShape.h in Headers */, + 50643BD919BFAF4400EF68ED /* CCApplication.h in Headers */, 15AE183619AAD2F700C27E9E /* CCObjLoader.h in Headers */, 15AE1BE719AAE01E00C27E9E /* CCTableViewCell.h in Headers */, 15AE1A8919AAD40300C27E9E /* b2PrismaticJoint.h in Headers */, @@ -5382,11 +5402,11 @@ 15AE188F19AAD33D00C27E9E /* CCLabelTTFLoader.h in Headers */, 50ABBEBD1925AB6F00A911A9 /* ccUtils.h in Headers */, 15AE19A119AAD39600C27E9E /* TextAtlasReader.h in Headers */, - 50ABC0231926664800A911A9 /* CCGLViewImpl.h in Headers */, + 50ABC0231926664800A911A9 /* CCGLViewImpl-desktop.h in Headers */, 15AE1AE319AAD42500C27E9E /* cpDampedSpring.h in Headers */, 15AE188D19AAD33D00C27E9E /* CCLabelBMFontLoader.h in Headers */, 15AE1B5019AADA9900C27E9E /* UILoadingBar.h in Headers */, - 50ABBFFD1926664800A911A9 /* CCFileUtilsApple.h in Headers */, + 50ABBFFD1926664800A911A9 /* CCFileUtils-apple.h in Headers */, 5034CA41191D591100CE6051 /* ccShader_Position_uColor.frag in Headers */, 50ABBE7F1925AB6F00A911A9 /* CCEventTouch.h in Headers */, 50ABBE5B1925AB6F00A911A9 /* CCEventKeyboard.h in Headers */, @@ -5417,7 +5437,7 @@ 1A01C69018F57BE800EFE3A6 /* CCDictionary.h in Headers */, 1A9DCA29180E6955007A3AD4 /* CCGLBufferedNode.h in Headers */, 15AE19C519AAD3A700C27E9E /* Animation.h in Headers */, - 50ABC0031926664800A911A9 /* CCLock.h in Headers */, + 50ABC0031926664800A911A9 /* CCLock-apple.h in Headers */, B37510721823AC9F00B3BA6A /* CCPhysicsBodyInfo_chipmunk.h in Headers */, 50ABBE2D1925AB6F00A911A9 /* ccCArray.h in Headers */, 50ABBD5E1925AB0000A911A9 /* Vec3.h in Headers */, @@ -5445,7 +5465,7 @@ 50ABBEA91925AB6F00A911A9 /* CCTouch.h in Headers */, 15AE1A5E19AAD40300C27E9E /* b2Body.h in Headers */, 50ABBE971925AB6F00A911A9 /* CCProtocols.h in Headers */, - 50ABC0691926664800A911A9 /* CCStdC.h in Headers */, + 50ABC0691926664800A911A9 /* CCStdC-mac.h in Headers */, 15AE1A2B19AAD3D500C27E9E /* b2Distance.h in Headers */, 15AE1ADE19AAD42500C27E9E /* chipmunk_private.h in Headers */, 15AE198919AAD36A00C27E9E /* ButtonReader.h in Headers */, @@ -5472,15 +5492,16 @@ buildActionMask = 2147483647; files = ( 15AE197E19AAD35700C27E9E /* CCNodeReader.h in Headers */, - 503DD8F01926736A00CD74DD /* CCStdC.h in Headers */, + 503DD8F01926736A00CD74DD /* CCStdC-ios.h in Headers */, 15AE1A9A19AAD40300C27E9E /* b2Math.h in Headers */, 46A170FF1807CECB005B8026 /* CCPhysicsContact.h in Headers */, 15AE1AC719AAD40300C27E9E /* b2GearJoint.h in Headers */, 50ABBDA21925AB4100A911A9 /* CCGroupCommand.h in Headers */, 15AE1A1C19AAD3A700C27E9E /* Slot.h in Headers */, 15AE18C219AAD33D00C27E9E /* CCLayerColorLoader.h in Headers */, + 50643BDA19BFAF4400EF68ED /* CCApplication.h in Headers */, 15AE181519AAD2F700C27E9E /* CCAnimationCurve.h in Headers */, - 503DD8EF1926736A00CD74DD /* CCPlatformDefine.h in Headers */, + 503DD8EF1926736A00CD74DD /* CCPlatformDefine-ios.h in Headers */, 15AE19F219AAD3A700C27E9E /* Event.h in Headers */, 15AE196919AAD35100C27E9E /* CocoStudio.h in Headers */, 46A171041807CECB005B8026 /* CCPhysicsShape.h in Headers */, @@ -5508,7 +5529,7 @@ 50ABBE2E1925AB6F00A911A9 /* ccCArray.h in Headers */, 15AE1A0C19AAD3A700C27E9E /* CCSkeletonAnimation.h in Headers */, 15AE1B9119AADA9A00C27E9E /* UIWidget.h in Headers */, - 50ABC0041926664800A911A9 /* CCLock.h in Headers */, + 50ABC0041926664800A911A9 /* CCLock-apple.h in Headers */, 15AE1A4019AAD3D500C27E9E /* b2Collision.h in Headers */, 5034CA40191D591100CE6051 /* ccShader_Position_uColor.vert in Headers */, 15AE184719AAD2F700C27E9E /* CCSprite3DMaterial.h in Headers */, @@ -5531,12 +5552,13 @@ 15AE19B719AAD39700C27E9E /* TextBMFontReader.h in Headers */, 1A570064180BC5A10088DEC7 /* CCAction.h in Headers */, 15AE1BA819AADFDF00C27E9E /* UIRelativeBox.h in Headers */, - 503DD8EC1926736A00CD74DD /* CCGLViewImpl.h in Headers */, + 503DD8EC1926736A00CD74DD /* CCGLViewImpl-ios.h in Headers */, 15AE18D819AAD33D00C27E9E /* CCScrollViewLoader.h in Headers */, 15AE1B0719AAD42500C27E9E /* cpBB.h in Headers */, 15AE18DB19AAD33D00C27E9E /* CocosBuilder.h in Headers */, 15AE1ACD19AAD40300C27E9E /* b2PrismaticJoint.h in Headers */, 50ABBEBA1925AB6F00A911A9 /* ccUTF8.h in Headers */, + 50643BD619BFAEDA00EF68ED /* CCPlatformDefine.h in Headers */, 15AE1A1219AAD3A700C27E9E /* RegionAttachment.h in Headers */, 1A570068180BC5A10088DEC7 /* CCActionCamera.h in Headers */, 15AE18BC19AAD33D00C27E9E /* CCControlLoader.h in Headers */, @@ -5584,10 +5606,10 @@ 15AE19F819AAD3A700C27E9E /* Animation.h in Headers */, 1A5700A1180BC5D20088DEC7 /* CCNode.h in Headers */, 15AE181919AAD2F700C27E9E /* CCAttachNode.h in Headers */, - 292DB14C19B4574100A80320 /* UIEditBoxImplMac.h in Headers */, + 292DB14C19B4574100A80320 /* UIEditBoxImpl-mac.h in Headers */, 15AE1BF019AAE01E00C27E9E /* CCControlHuePicker.h in Headers */, 15AE18B819AAD33D00C27E9E /* CCBSequenceProperty.h in Headers */, - 503DD8E41926736A00CD74DD /* CCDirectorCaller.h in Headers */, + 503DD8E41926736A00CD74DD /* CCDirectorCaller-ios.h in Headers */, 15AE198119AAD35700C27E9E /* CCTimelineMacro.h in Headers */, 15AE1B7719AADA9A00C27E9E /* UIPageView.h in Headers */, 50ABBD8A1925AB4100A911A9 /* CCCustomCommand.h in Headers */, @@ -5600,7 +5622,7 @@ 1A570111180BC8EE0088DEC7 /* CCDrawingPrimitives.h in Headers */, 50ABBE381925AB6F00A911A9 /* CCConsole.h in Headers */, 50ABBE8A1925AB6F00A911A9 /* CCMap.h in Headers */, - 503DD8E61926736A00CD74DD /* CCEAGLView.h in Headers */, + 503DD8E61926736A00CD74DD /* CCEAGLView-ios.h in Headers */, 50ABBE4C1925AB6F00A911A9 /* CCEventAcceleration.h in Headers */, 50ABBD571925AB0000A911A9 /* TransformUtils.h in Headers */, 15AE1B0419AAD42500C27E9E /* cpSlideJoint.h in Headers */, @@ -5610,11 +5632,11 @@ 15AE1AB319AAD40300C27E9E /* b2CircleContact.h in Headers */, 5034CA2E191D591100CE6051 /* ccShader_PositionTextureA8Color.frag in Headers */, 15AE1A4F19AAD3D500C27E9E /* b2Shape.h in Headers */, - 29394CF519B01DBA00D2DE1A /* UIWebViewImpl_iOS.h in Headers */, + 29394CF519B01DBA00D2DE1A /* UIWebViewImpl-ios.h in Headers */, 50ABBD5B1925AB0000A911A9 /* Vec2.h in Headers */, 50ABBD411925AB0000A911A9 /* CCMath.h in Headers */, 1A5701A0180BCB590088DEC7 /* CCFont.h in Headers */, - 292DB14819B4574100A80320 /* UIEditBoxImplIOS.h in Headers */, + 292DB14819B4574100A80320 /* UIEditBoxImpl-ios.h in Headers */, 15AE1A0819AAD3A700C27E9E /* BoneData.h in Headers */, 50ABBD9A1925AB4100A911A9 /* CCGLProgramStateCache.h in Headers */, 15AE181D19AAD2F700C27E9E /* CCBundle3D.h in Headers */, @@ -5622,12 +5644,12 @@ 15AE1BBB19AADFF000C27E9E /* HttpRequest.h in Headers */, B230ED7419B417AE00364AA8 /* CCTrianglesCommand.h in Headers */, 15AE1A0019AAD3A700C27E9E /* AtlasAttachmentLoader.h in Headers */, - 50ED2BE119BEAF7900A0AB90 /* UIEditBoxImplWin.h in Headers */, + 50ED2BE119BEAF7900A0AB90 /* UIEditBoxImpl-win32.h in Headers */, 15AE1ACB19AAD40300C27E9E /* b2MouseJoint.h in Headers */, 50ABBD3F1925AB0000A911A9 /* CCGeometry.h in Headers */, 3EA3EDBF1991CDFA00645534 /* CCCamera.h in Headers */, 15AE1AD319AAD40300C27E9E /* b2RopeJoint.h in Headers */, - 50ABBFFE1926664800A911A9 /* CCFileUtilsApple.h in Headers */, + 50ABBFFE1926664800A911A9 /* CCFileUtils-apple.h in Headers */, 15AE1AAD19AAD40300C27E9E /* b2WorldCallbacks.h in Headers */, 1A5701A4180BCB590088DEC7 /* CCFontAtlas.h in Headers */, 15AE1C0219AAE01E00C27E9E /* CCScrollView.h in Headers */, @@ -5648,7 +5670,7 @@ 15AE196B19AAD35100C27E9E /* DictionaryHelper.h in Headers */, 15AE1AA619AAD40300C27E9E /* b2Fixture.h in Headers */, 15AE1BBA19AADFF000C27E9E /* HttpClient.h in Headers */, - 292DB14619B4574100A80320 /* UIEditBoxImplAndroid.h in Headers */, + 292DB14619B4574100A80320 /* UIEditBoxImpl-android.h in Headers */, 15AE1AF819AAD42500C27E9E /* chipmunk_types.h in Headers */, 15AE1B9419AADA9A00C27E9E /* GUIDefine.h in Headers */, 15AE183B19AAD2F700C27E9E /* CCRay.h in Headers */, @@ -5669,6 +5691,7 @@ 1A01C69518F57BE800EFE3A6 /* CCFloat.h in Headers */, 1A5701CA180BCB5A0088DEC7 /* CCLabelTextFormatter.h in Headers */, 15AE1B0B19AAD42500C27E9E /* cpSpace.h in Headers */, + 50643BDC19BFAF4400EF68ED /* CCStdC.h in Headers */, 5034CA22191D591100CE6051 /* ccShader_PositionTextureColorAlphaTest.frag in Headers */, 15AE1B8E19AADA9A00C27E9E /* UIDeprecated.h in Headers */, 15AE1A3919AAD3D500C27E9E /* Box2D.h in Headers */, @@ -5823,10 +5846,10 @@ 15AE1A9519AAD40300C27E9E /* b2BlockAllocator.h in Headers */, 5034CA48191D591100CE6051 /* ccShader_Label_normal.frag in Headers */, 15AE183F19AAD2F700C27E9E /* CCSkeleton3D.h in Headers */, - 50ED2BE319BEAF7900A0AB90 /* UIEditBoxImplWp8.h in Headers */, + 50ED2BE319BEAF7900A0AB90 /* UIEditBoxImpl-wp8.h in Headers */, 50ABBD531925AB0000A911A9 /* Quaternion.h in Headers */, 15AE19B119AAD39700C27E9E /* ScrollViewReader.h in Headers */, - 503DD8E81926736A00CD74DD /* CCES2Renderer.h in Headers */, + 503DD8E81926736A00CD74DD /* CCES2Renderer-ios.h in Headers */, 50ABBE6C1925AB6F00A911A9 /* CCEventListenerFocus.h in Headers */, 5034CA3E191D591100CE6051 /* ccShader_PositionColor.frag in Headers */, 50ABBE301925AB6F00A911A9 /* ccConfig.h in Headers */, @@ -5840,7 +5863,7 @@ 50ABBEA61925AB6F00A911A9 /* CCScriptSupport.h in Headers */, 46C02E0A18E91123004B7456 /* xxhash.h in Headers */, 5034CA4C191D591100CE6051 /* ccShader_Label_df_glow.frag in Headers */, - 503DD8EB1926736A00CD74DD /* CCGL.h in Headers */, + 503DD8EB1926736A00CD74DD /* CCGL-ios.h in Headers */, 50ABBE3C1925AB6F00A911A9 /* CCData.h in Headers */, 503DD8FA1926B0DB00CD74DD /* CCIMEDispatcher.h in Headers */, 50ABBEC81925AB6F00A911A9 /* etc1.h in Headers */, @@ -5865,7 +5888,7 @@ 15AE18D619AAD33D00C27E9E /* CCScale9SpriteLoader.h in Headers */, 15AE182B19AAD2F700C27E9E /* CCMeshSkin.h in Headers */, 15AE1B7D19AADA9A00C27E9E /* UISlider.h in Headers */, - 503DD8E01926736A00CD74DD /* CCApplication.h in Headers */, + 503DD8E01926736A00CD74DD /* CCApplication-ios.h in Headers */, 15AE1B8319AADA9A00C27E9E /* UITextBMFont.h in Headers */, 50ABBD8E1925AB4100A911A9 /* CCGLProgram.h in Headers */, 50ABC0081926664800A911A9 /* CCApplicationProtocol.h in Headers */, @@ -5889,6 +5912,7 @@ 15AE192819AAD35100C27E9E /* TriggerBase.h in Headers */, 15AE1BF419AAE01E00C27E9E /* CCControlSaturationBrightnessPicker.h in Headers */, 15AE1AD119AAD40300C27E9E /* b2RevoluteJoint.h in Headers */, + 50643BD519BFAECF00EF68ED /* CCGL.h in Headers */, 15AE1A2119AAD3A700C27E9E /* spine.h in Headers */, 15AE1B0919AAD42500C27E9E /* cpPolyShape.h in Headers */, 15AE193919AAD35100C27E9E /* CCArmatureAnimation.h in Headers */, @@ -5945,7 +5969,7 @@ 15AE184D19AAD30800C27E9E /* SimpleAudioEngine.h in Headers */, 1A01C68D18F57BE800EFE3A6 /* CCDeprecated.h in Headers */, 15AE1B0C19AAD42500C27E9E /* cpSpatialIndex.h in Headers */, - 503DD8EA1926736A00CD74DD /* CCESRenderer.h in Headers */, + 503DD8EA1926736A00CD74DD /* CCESRenderer-ios.h in Headers */, 50ABBE581925AB6F00A911A9 /* CCEventFocus.h in Headers */, 15AE196419AAD35100C27E9E /* CCTransformHelp.h in Headers */, 15AE1AAF19AAD40300C27E9E /* b2ChainAndCircleContact.h in Headers */, @@ -5958,7 +5982,7 @@ B375107D1823ACA100B3BA6A /* CCPhysicsBodyInfo_chipmunk.h in Headers */, 15AE1B0519AAD42500C27E9E /* util.h in Headers */, 50ABC01C1926664800A911A9 /* CCSAXParser.h in Headers */, - 503DD8F11926736A00CD74DD /* OpenGL_Internal.h in Headers */, + 503DD8F11926736A00CD74DD /* OpenGL_Internal-ios.h in Headers */, B37510801823ACA100B3BA6A /* CCPhysicsHelper_chipmunk.h in Headers */, 50ABBDAA1925AB4100A911A9 /* CCRenderCommand.h in Headers */, 15AE1BE919AAE01E00C27E9E /* CCControl.h in Headers */, @@ -6046,7 +6070,7 @@ 15AE1B1E19AAD43700C27E9E /* cpBody.c in Sources */, 15AE1BDE19AAE01E00C27E9E /* CCInvocation.cpp in Sources */, 3EA3EDBC1991CDFA00645534 /* CCCamera.cpp in Sources */, - 292DB14F19B4574100A80320 /* UIEditBoxImplNone.cpp in Sources */, + 292DB14F19B4574100A80320 /* UIEditBoxImpl-stub.cpp in Sources */, 15AE199419AAD39600C27E9E /* LayoutReader.cpp in Sources */, 1A01C68A18F57BE800EFE3A6 /* CCDeprecated.cpp in Sources */, 1A1645B0191B726C008C7C7F /* ConvertUTF.c in Sources */, @@ -6065,7 +6089,7 @@ 15AE189D19AAD33D00C27E9E /* CCNodeLoader.cpp in Sources */, 15AE1B2719AAD43700C27E9E /* cpSpaceStep.c in Sources */, 5027253C190BF1B900AAF4ED /* cocos2d.cpp in Sources */, - 50ABC0611926664800A911A9 /* CCCommon.mm in Sources */, + 50ABC0611926664800A911A9 /* CCCommon-mac.mm in Sources */, 15AE1B2519AAD43700C27E9E /* cpSpaceHash.c in Sources */, 50ABBDB11925AB4100A911A9 /* ccShaders.cpp in Sources */, 15AE198219AAD36400C27E9E /* WidgetReader.cpp in Sources */, @@ -6124,7 +6148,7 @@ 15AE1A8219AAD40300C27E9E /* b2GearJoint.cpp in Sources */, 1A570071180BC5A10088DEC7 /* CCActionGrid.cpp in Sources */, B37510761823AC9F00B3BA6A /* CCPhysicsJointInfo_chipmunk.cpp in Sources */, - 50ABBFFF1926664800A911A9 /* CCFileUtilsApple.mm in Sources */, + 50ABBFFF1926664800A911A9 /* CCFileUtils-apple.mm in Sources */, 1A570075180BC5A10088DEC7 /* CCActionGrid3D.cpp in Sources */, 15AE1B2019AAD43700C27E9E /* cpHashSet.c in Sources */, 15AE1C1319AAE2C600C27E9E /* CCPhysicsSprite.cpp in Sources */, @@ -6156,7 +6180,7 @@ 50ED2BD919BE5D5D00A0AB90 /* CCEventListenerController.cpp in Sources */, B257B460198A353E00D9A687 /* CCPrimitiveCommand.cpp in Sources */, 15AE19A419AAD39600C27E9E /* TextFieldReader.cpp in Sources */, - 50ED2BDB19BE76D500A0AB90 /* UIVideoPlayerIOS.mm in Sources */, + 50ED2BDB19BE76D500A0AB90 /* UIVideoPlayer-ios.mm in Sources */, 15AE1B5F19AADA9900C27E9E /* UITextField.cpp in Sources */, 15AE187C19AAD33D00C27E9E /* CCBFileLoader.cpp in Sources */, 50ABBE651925AB6F00A911A9 /* CCEventListenerCustom.cpp in Sources */, @@ -6167,7 +6191,7 @@ 50ABBE391925AB6F00A911A9 /* CCData.cpp in Sources */, 1A57010E180BC8EE0088DEC7 /* CCDrawingPrimitives.cpp in Sources */, 50ABBED71925AB6F00A911A9 /* ZipUtils.cpp in Sources */, - 292DB14919B4574100A80320 /* UIEditBoxImplIOS.mm in Sources */, + 292DB14919B4574100A80320 /* UIEditBoxImpl-ios.mm in Sources */, 15AE181019AAD2F700C27E9E /* CCAnimation3D.cpp in Sources */, 1A01C68418F57BE800EFE3A6 /* CCArray.cpp in Sources */, 1A570112180BC8EE0088DEC7 /* CCDrawNode.cpp in Sources */, @@ -6248,7 +6272,7 @@ 1A570208180BCBDF0088DEC7 /* CCMotionStreak.cpp in Sources */, 1A570210180BCBF40088DEC7 /* CCProgressTimer.cpp in Sources */, 292DB15F19B461CA00A80320 /* ExtensionDeprecated.cpp in Sources */, - 292DB14D19B4574100A80320 /* UIEditBoxImplMac.mm in Sources */, + 292DB14D19B4574100A80320 /* UIEditBoxImpl-mac.mm in Sources */, 50ABBDB51925AB4100A911A9 /* CCTexture2D.cpp in Sources */, 1A570214180BCBF40088DEC7 /* CCRenderTexture.cpp in Sources */, 15AE1BD019AAE01E00C27E9E /* CCControlHuePicker.cpp in Sources */, @@ -6337,7 +6361,7 @@ 1A01C69C18F57BE800EFE3A6 /* CCString.cpp in Sources */, 50ABBD3C1925AB0000A911A9 /* CCGeometry.cpp in Sources */, 15AE188A19AAD33D00C27E9E /* CCControlLoader.cpp in Sources */, - 50ABC0011926664800A911A9 /* CCLock.cpp in Sources */, + 50ABC0011926664800A911A9 /* CCLock-apple.cpp in Sources */, 15AE1A8019AAD40300C27E9E /* b2FrictionJoint.cpp in Sources */, 50ABBD931925AB4100A911A9 /* CCGLProgramState.cpp in Sources */, 15AE183419AAD2F700C27E9E /* CCObjLoader.cpp in Sources */, @@ -6347,9 +6371,9 @@ 1A570358180BD0B00088DEC7 /* unzip.cpp in Sources */, 15AE19D219AAD3A700C27E9E /* Bone.cpp in Sources */, 15AE196E19AAD35700C27E9E /* CCActionTimelineCache.cpp in Sources */, - 50ABBEB31925AB6F00A911A9 /* CCUserDefault.mm in Sources */, - 50ABBEB51925AB6F00A911A9 /* CCUserDefaultAndroid.cpp in Sources */, - 29394CF619B01DBA00D2DE1A /* UIWebViewImpl_iOS.mm in Sources */, + 50ABBEB31925AB6F00A911A9 /* CCUserDefault-apple.mm in Sources */, + 50ABBEB51925AB6F00A911A9 /* CCUserDefault-android.cpp in Sources */, + 29394CF619B01DBA00D2DE1A /* UIWebViewImpl-ios.mm in Sources */, 50ABBE831925AB6F00A911A9 /* ccFPSImages.c in Sources */, 15AE1B7019AADA9900C27E9E /* CocosGUI.cpp in Sources */, 15AE19D019AAD3A700C27E9E /* AttachmentLoader.cpp in Sources */, @@ -6383,13 +6407,13 @@ 50ABBE751925AB6F00A911A9 /* CCEventListenerTouch.cpp in Sources */, 15AE18F019AAD35000C27E9E /* CCArmatureAnimation.cpp in Sources */, 50ABBE511925AB6F00A911A9 /* CCEventDispatcher.cpp in Sources */, - 50ABC0051926664800A911A9 /* CCThread.mm in Sources */, - 50ABC0631926664800A911A9 /* CCDevice.mm in Sources */, + 50ABC0051926664800A911A9 /* CCThread-apple.mm in Sources */, + 50ABC0631926664800A911A9 /* CCDevice-mac.mm in Sources */, 15AE1A2819AAD3D500C27E9E /* b2Collision.cpp in Sources */, 15AE1B6719AADA9900C27E9E /* UIScale9Sprite.cpp in Sources */, - 292DB14319B4574100A80320 /* UIEditBoxImplAndroid.cpp in Sources */, + 292DB14319B4574100A80320 /* UIEditBoxImpl-android.cpp in Sources */, 15AE1A5219AAD40300C27E9E /* b2Draw.cpp in Sources */, - 50ED2BE419BEAF7900A0AB90 /* UIEditBoxImplWin.cpp in Sources */, + 50ED2BE419BEAF7900A0AB90 /* UIEditBoxImpl-win32.cpp in Sources */, 50ABBE1F1925AB6F00A911A9 /* atitc.cpp in Sources */, 1A01C69818F57BE800EFE3A6 /* CCSet.cpp in Sources */, 1AAF584F180E40B9000584C8 /* LocalStorage.cpp in Sources */, @@ -6434,7 +6458,7 @@ 15AE190919AAD35000C27E9E /* CCDecorativeDisplay.cpp in Sources */, 15AE18E319AAD35000C27E9E /* TriggerObj.cpp in Sources */, 15AE1BA119AADFDF00C27E9E /* UILayoutParameter.cpp in Sources */, - 50ABC0211926664800A911A9 /* CCGLViewImpl.cpp in Sources */, + 50ABC0211926664800A911A9 /* CCGLViewImpl-desktop.cpp in Sources */, 50ABC00D1926664800A911A9 /* CCFileUtils.cpp in Sources */, 50ABBE4D1925AB6F00A911A9 /* CCEventCustom.cpp in Sources */, 15AE1B1319AAD43700C27E9E /* cpGrooveJoint.c in Sources */, @@ -6454,7 +6478,7 @@ 15AE1A6319AAD40300C27E9E /* b2Island.cpp in Sources */, 15AE1A8419AAD40300C27E9E /* b2Joint.cpp in Sources */, 50ABBD601925AB0000A911A9 /* Vec4.cpp in Sources */, - 50ABC05F1926664800A911A9 /* CCApplication.mm in Sources */, + 50ABC05F1926664800A911A9 /* CCApplication-mac.mm in Sources */, 15AE1A9219AAD40300C27E9E /* b2WheelJoint.cpp in Sources */, B29594B41926D5EC003EEF37 /* CCMeshCommand.cpp in Sources */, 15AE1B1619AAD43700C27E9E /* cpRatchetJoint.c in Sources */, @@ -6462,7 +6486,7 @@ 15AE1BB719AADFEF00C27E9E /* WebSocket.cpp in Sources */, 15AE1B5119AADA9900C27E9E /* UIPageView.cpp in Sources */, 15AE19EA19AAD3A700C27E9E /* SlotData.cpp in Sources */, - 50ED2BE619BEAF7900A0AB90 /* UIEditBoxImplWp8.cpp in Sources */, + 50ED2BE619BEAF7900A0AB90 /* UIEditBoxImpl-wp8.cpp in Sources */, 15AE18EC19AAD35000C27E9E /* CCActionObject.cpp in Sources */, 1A01C68E18F57BE800EFE3A6 /* CCDictionary.cpp in Sources */, 50ABBD381925AB0000A911A9 /* CCAffineTransform.cpp in Sources */, @@ -6483,7 +6507,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 15AE1B9819AADAA100C27E9E /* UIVideoPlayerIOS.mm in Sources */, + 15AE1B9819AADAA100C27E9E /* UIVideoPlayer-ios.mm in Sources */, 15AE1C0519AAE01E00C27E9E /* CCTableViewCell.cpp in Sources */, 15AE1B4019AAD43700C27E9E /* cpShape.c in Sources */, 15AE198A19AAD36A00C27E9E /* ButtonReader.cpp in Sources */, @@ -6503,7 +6527,7 @@ 46A171031807CECB005B8026 /* CCPhysicsShape.cpp in Sources */, 50ABC0161926664800A911A9 /* CCImage.cpp in Sources */, 1A01C6A518F58F7500EFE3A6 /* CCNotificationCenter.cpp in Sources */, - 292DB14E19B4574100A80320 /* UIEditBoxImplMac.mm in Sources */, + 292DB14E19B4574100A80320 /* UIEditBoxImpl-mac.mm in Sources */, 15AE1BFB19AAE01E00C27E9E /* CCControlUtils.cpp in Sources */, B230ED7219B417AE00364AA8 /* CCTrianglesCommand.cpp in Sources */, 15AE1B9019AADA9A00C27E9E /* UIWidget.cpp in Sources */, @@ -6513,7 +6537,7 @@ 50ABBE561925AB6F00A911A9 /* CCEventFocus.cpp in Sources */, 15AE1B3419AAD43700C27E9E /* cpRatchetJoint.c in Sources */, 15AE183D19AAD2F700C27E9E /* CCSkeleton3D.cpp in Sources */, - 503DD8E11926736A00CD74DD /* CCApplication.mm in Sources */, + 503DD8E11926736A00CD74DD /* CCApplication-ios.mm in Sources */, 15AE1AAC19AAD40300C27E9E /* b2WorldCallbacks.cpp in Sources */, 15AE1A0319AAD3A700C27E9E /* AttachmentLoader.cpp in Sources */, 15AE18C719AAD33D00C27E9E /* CCMenuItemImageLoader.cpp in Sources */, @@ -6523,7 +6547,7 @@ 15AE185C19AAD31200C27E9E /* CDOpenALSupport.m in Sources */, 15AE186119AAD31200C27E9E /* SimpleAudioEngine_objc.m in Sources */, 15AE182519AAD2F700C27E9E /* CCMesh.cpp in Sources */, - 503DD8EE1926736A00CD74DD /* CCImage.mm in Sources */, + 503DD8EE1926736A00CD74DD /* CCImage-ios.mm in Sources */, B37510811823ACA100B3BA6A /* CCPhysicsJointInfo_chipmunk.cpp in Sources */, 46A170FC1807CECB005B8026 /* CCPhysicsBody.cpp in Sources */, 15AE1BEA19AAE01E00C27E9E /* CCControlButton.cpp in Sources */, @@ -6602,7 +6626,7 @@ 15AE1B4319AAD43700C27E9E /* cpSpaceHash.c in Sources */, 15AE1A1D19AAD3A700C27E9E /* SlotData.cpp in Sources */, 50ABBD551925AB0000A911A9 /* TransformUtils.cpp in Sources */, - 292DB14419B4574100A80320 /* UIEditBoxImplAndroid.cpp in Sources */, + 292DB14419B4574100A80320 /* UIEditBoxImpl-android.cpp in Sources */, 15AE193619AAD35100C27E9E /* CCArmature.cpp in Sources */, 1A57007A180BC5A10088DEC7 /* CCActionInstant.cpp in Sources */, 15AE1AC419AAD40300C27E9E /* b2FrictionJoint.cpp in Sources */, @@ -6650,8 +6674,8 @@ 15AE1ACC19AAD40300C27E9E /* b2PrismaticJoint.cpp in Sources */, 15AE195F19AAD35100C27E9E /* CCSpriteFrameCacheHelper.cpp in Sources */, 15AE193019AAD35100C27E9E /* CCActionManagerEx.cpp in Sources */, - 503DD8E21926736A00CD74DD /* CCCommon.mm in Sources */, - 292DB14A19B4574100A80320 /* UIEditBoxImplIOS.mm in Sources */, + 503DD8E21926736A00CD74DD /* CCCommon-ios.mm in Sources */, + 292DB14A19B4574100A80320 /* UIEditBoxImpl-ios.mm in Sources */, 15AE1A9419AAD40300C27E9E /* b2BlockAllocator.cpp in Sources */, 15AE1B4419AAD43700C27E9E /* cpSpaceQuery.c in Sources */, 15AE1A4D19AAD3D500C27E9E /* b2PolygonShape.cpp in Sources */, @@ -6685,7 +6709,7 @@ 15AE1A0B19AAD3A700C27E9E /* CCSkeletonAnimation.cpp in Sources */, 15AE1B7C19AADA9A00C27E9E /* UISlider.cpp in Sources */, 15AE1AA519AAD40300C27E9E /* b2Fixture.cpp in Sources */, - 50ED2BE719BEAF7900A0AB90 /* UIEditBoxImplWp8.cpp in Sources */, + 50ED2BE719BEAF7900A0AB90 /* UIEditBoxImpl-wp8.cpp in Sources */, 15AE1BAD19AADFDF00C27E9E /* UILayoutParameter.cpp in Sources */, B375107E1823ACA100B3BA6A /* CCPhysicsContactInfo_chipmunk.cpp in Sources */, 15AE19AA19AAD39700C27E9E /* ListViewReader.cpp in Sources */, @@ -6723,14 +6747,14 @@ 1A570211180BCBF40088DEC7 /* CCProgressTimer.cpp in Sources */, 15AE193819AAD35100C27E9E /* CCArmatureAnimation.cpp in Sources */, 15AE1B3819AAD43700C27E9E /* cpArbiter.c in Sources */, - 503DD8ED1926736A00CD74DD /* CCGLViewImpl.mm in Sources */, + 503DD8ED1926736A00CD74DD /* CCGLViewImpl-ios.mm in Sources */, 15AE197719AAD35700C27E9E /* CCActionTimeline.cpp in Sources */, 15AE1A0F19AAD3A700C27E9E /* Json.cpp in Sources */, 15AE19B419AAD39700C27E9E /* TextAtlasReader.cpp in Sources */, 15AE194019AAD35100C27E9E /* CCBone.cpp in Sources */, 1A570215180BCBF40088DEC7 /* CCRenderTexture.cpp in Sources */, 1A570222180BCC1A0088DEC7 /* CCParticleBatchNode.cpp in Sources */, - 292DB15019B4574100A80320 /* UIEditBoxImplNone.cpp in Sources */, + 292DB15019B4574100A80320 /* UIEditBoxImpl-stub.cpp in Sources */, 15AE19F119AAD3A700C27E9E /* Event.cpp in Sources */, 15AE185F19AAD31200C27E9E /* SimpleAudioEngine.mm in Sources */, 15AE1BE819AAE01E00C27E9E /* CCControl.cpp in Sources */, @@ -6745,7 +6769,7 @@ 15AE1BFD19AAE01E00C27E9E /* CCInvocation.cpp in Sources */, B24AA98A195A675C007B4522 /* CCFastTMXTiledMap.cpp in Sources */, 15AE18CE19AAD33D00C27E9E /* CCNodeLoader.cpp in Sources */, - 29394CF719B01DBA00D2DE1A /* UIWebViewImpl_iOS.mm in Sources */, + 29394CF719B01DBA00D2DE1A /* UIWebViewImpl-ios.mm in Sources */, 15AE1AC619AAD40300C27E9E /* b2GearJoint.cpp in Sources */, B24AA986195A675C007B4522 /* CCFastTMXLayer.cpp in Sources */, 1A57022E180BCC1A0088DEC7 /* CCParticleSystemQuad.cpp in Sources */, @@ -6811,9 +6835,9 @@ 50ABBE2C1925AB6F00A911A9 /* ccCArray.cpp in Sources */, 15AE193219AAD35100C27E9E /* CCActionNode.cpp in Sources */, 15AE195319AAD35100C27E9E /* CCDisplayFactory.cpp in Sources */, - 50ABC0061926664800A911A9 /* CCThread.mm in Sources */, + 50ABC0061926664800A911A9 /* CCThread-apple.mm in Sources */, B375107C1823ACA100B3BA6A /* CCPhysicsBodyInfo_chipmunk.cpp in Sources */, - 50ABBEB61925AB6F00A911A9 /* CCUserDefaultAndroid.cpp in Sources */, + 50ABBEB61925AB6F00A911A9 /* CCUserDefault-android.cpp in Sources */, 1A57034C180BD09B0088DEC7 /* tinyxml2.cpp in Sources */, 50ABBDB61925AB4100A911A9 /* CCTexture2D.cpp in Sources */, 15AE1BAB19AADFDF00C27E9E /* UILayout.cpp in Sources */, @@ -6832,7 +6856,7 @@ 15AE1BC719AAE00000C27E9E /* AssetsManager.cpp in Sources */, 50ABBEA81925AB6F00A911A9 /* CCTouch.cpp in Sources */, 15AE1A9619AAD40300C27E9E /* b2Draw.cpp in Sources */, - 503DD8E91926736A00CD74DD /* CCES2Renderer.m in Sources */, + 503DD8E91926736A00CD74DD /* CCES2Renderer-ios.m in Sources */, 5027253D190BF1B900AAF4ED /* cocos2d.cpp in Sources */, 15AE183919AAD2F700C27E9E /* CCRay.cpp in Sources */, 15AE1B8219AADA9A00C27E9E /* UITextBMFont.cpp in Sources */, @@ -6865,12 +6889,12 @@ 50ABBEA41925AB6F00A911A9 /* CCScriptSupport.cpp in Sources */, 3E6176761960F89B00DE83F5 /* CCEventListenerController.cpp in Sources */, 15AE1AC219AAD40300C27E9E /* b2DistanceJoint.cpp in Sources */, - 503DD8E71926736A00CD74DD /* CCEAGLView.mm in Sources */, + 503DD8E71926736A00CD74DD /* CCEAGLView-ios.mm in Sources */, 50ABBDA41925AB4100A911A9 /* CCQuadCommand.cpp in Sources */, 15AE18C319AAD33D00C27E9E /* CCLayerGradientLoader.cpp in Sources */, 15AE197919AAD35700C27E9E /* CCActionTimelineCache.cpp in Sources */, 1AAF5850180E40B9000584C8 /* LocalStorage.cpp in Sources */, - 50ED2BE519BEAF7900A0AB90 /* UIEditBoxImplWin.cpp in Sources */, + 50ED2BE519BEAF7900A0AB90 /* UIEditBoxImpl-win32.cpp in Sources */, 15AE192E19AAD35100C27E9E /* CCActionFrameEasing.cpp in Sources */, 15AE195519AAD35100C27E9E /* CCDisplayManager.cpp in Sources */, 15AE1BA719AADFDF00C27E9E /* UIRelativeBox.cpp in Sources */, @@ -6891,16 +6915,16 @@ 15AE1AA719AAD40300C27E9E /* b2Island.cpp in Sources */, 3E6176741960F89B00DE83F5 /* CCEventController.cpp in Sources */, 50ABBE361925AB6F00A911A9 /* CCConsole.cpp in Sources */, - 503DD8E51926736A00CD74DD /* CCDirectorCaller.mm in Sources */, + 503DD8E51926736A00CD74DD /* CCDirectorCaller-ios.mm in Sources */, 15AE194519AAD35100C27E9E /* CCComAttribute.cpp in Sources */, 15AE18CC19AAD33D00C27E9E /* CCNode+CCBRelativePositioning.cpp in Sources */, 50ABBD5D1925AB0000A911A9 /* Vec3.cpp in Sources */, 50ABC0121926664800A911A9 /* CCGLView.cpp in Sources */, - 50ABC0021926664800A911A9 /* CCLock.cpp in Sources */, + 50ABC0021926664800A911A9 /* CCLock-apple.cpp in Sources */, 50ABBEBC1925AB6F00A911A9 /* ccUtils.cpp in Sources */, 15AE1A4719AAD3D500C27E9E /* b2ChainShape.cpp in Sources */, 50ABBE721925AB6F00A911A9 /* CCEventListenerMouse.cpp in Sources */, - 50ABC0001926664800A911A9 /* CCFileUtilsApple.mm in Sources */, + 50ABC0001926664800A911A9 /* CCFileUtils-apple.mm in Sources */, 50ABBEB81925AB6F00A911A9 /* ccUTF8.cpp in Sources */, 15AE194F19AAD35100C27E9E /* CCDatas.cpp in Sources */, 50ABBE841925AB6F00A911A9 /* ccFPSImages.c in Sources */, @@ -6911,10 +6935,10 @@ 15AE183519AAD2F700C27E9E /* CCObjLoader.cpp in Sources */, 50ABBED01925AB6F00A911A9 /* TGAlib.cpp in Sources */, 1A01C68518F57BE800EFE3A6 /* CCArray.cpp in Sources */, - 503DD8E31926736A00CD74DD /* CCDevice.mm in Sources */, + 503DD8E31926736A00CD74DD /* CCDevice-ios.mm in Sources */, 15AE1AB419AAD40300C27E9E /* b2Contact.cpp in Sources */, 15AE19F719AAD3A700C27E9E /* Animation.cpp in Sources */, - 50ABBEB41925AB6F00A911A9 /* CCUserDefault.mm in Sources */, + 50ABBEB41925AB6F00A911A9 /* CCUserDefault-apple.mm in Sources */, 1A1645B1191B726C008C7C7F /* ConvertUTF.c in Sources */, 50ABBE3A1925AB6F00A911A9 /* CCData.cpp in Sources */, 1A1645B3191B726C008C7C7F /* ConvertUTFWrapper.cpp in Sources */, diff --git a/cocos/2d/CCActionCamera.cpp b/cocos/2d/CCActionCamera.cpp index 820de644e0..2241bbec5b 100644 --- a/cocos/2d/CCActionCamera.cpp +++ b/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 // diff --git a/cocos/2d/CCActionInterval.cpp b/cocos/2d/CCActionInterval.cpp index e169d00f3a..404416be59 100644 --- a/cocos/2d/CCActionInterval.cpp +++ b/cocos/2d/CCActionInterval.cpp @@ -26,16 +26,17 @@ THE SOFTWARE. ****************************************************************************/ #include "2d/CCActionInterval.h" + +#include + #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 +#include "platform/CCStdC.h" NS_CC_BEGIN diff --git a/cocos/2d/CCClippingNode.h b/cocos/2d/CCClippingNode.h index 6fde2fe9b7..ba9301e590 100644 --- a/cocos/2d/CCClippingNode.h +++ b/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" diff --git a/cocos/2d/CCDrawNode.cpp b/cocos/2d/CCDrawNode.cpp index 4d7f7d7924..3094221cc0 100644 --- a/cocos/2d/CCDrawNode.cpp +++ b/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 diff --git a/cocos/2d/CCDrawingPrimitives.cpp b/cocos/2d/CCDrawingPrimitives.cpp index 456a88a66e..83a2ad90a8 100644 --- a/cocos/2d/CCDrawingPrimitives.cpp +++ b/cocos/2d/CCDrawingPrimitives.cpp @@ -41,12 +41,12 @@ THE SOFTWARE. #include #include -#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 diff --git a/cocos/2d/CCFontAtlas.h b/cocos/2d/CCFontAtlas.h index 73eb643ef9..d2a43a2375 100644 --- a/cocos/2d/CCFontAtlas.h +++ b/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 #include +#include "base/CCPlatformMacros.h" +#include "base/CCRef.h" +#include "platform/CCStdC.h" // ssize_t on windows + NS_CC_BEGIN //fwd diff --git a/cocos/2d/CCGLBufferedNode.h b/cocos/2d/CCGLBufferedNode.h index 4cc28a4721..0fdd30d0fb 100644 --- a/cocos/2d/CCGLBufferedNode.h +++ b/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 { diff --git a/cocos/2d/CCGrabber.h b/cocos/2d/CCGrabber.h index d53918d4bb..f7830225f5 100644 --- a/cocos/2d/CCGrabber.h +++ b/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 diff --git a/cocos/2d/CCGrid.cpp b/cocos/2d/CCGrid.cpp index db68c100ce..20fa4a653f 100644 --- a/cocos/2d/CCGrid.cpp +++ b/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 diff --git a/cocos/2d/CCMenu.cpp b/cocos/2d/CCMenu.cpp index 811fa3f0e4..7d9141edc6 100644 --- a/cocos/2d/CCMenu.cpp +++ b/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 diff --git a/cocos/Android.mk b/cocos/Android.mk index 87573c5ce1..b8721b64ab 100644 --- a/cocos/Android.mk +++ b/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 \ diff --git a/cocos/base/CCConfiguration.h b/cocos/base/CCConfiguration.h index 2b215695a7..acb9d73ece 100644 --- a/cocos/base/CCConfiguration.h +++ b/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 +#include "base/CCRef.h" +#include "base/CCValue.h" +#include "platform/CCGL.h" + NS_CC_BEGIN /** diff --git a/cocos/base/CCData.h b/cocos/base/CCData.h index 7532093bae..f442e32a5f 100644 --- a/cocos/base/CCData.h +++ b/cocos/base/CCData.h @@ -29,7 +29,7 @@ #include "base/CCPlatformMacros.h" #include // for ssize_t on android #include // 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 diff --git a/cocos/base/CCDirector.cpp b/cocos/base/CCDirector.cpp index e660eb96e7..3c28800afd 100644 --- a/cocos/base/CCDirector.cpp +++ b/cocos/base/CCDirector.cpp @@ -57,9 +57,8 @@ THE SOFTWARE. #include "base/CCConsole.h" #include "base/CCAutoreleasePool.h" #include "base/CCConfiguration.h" - -#include "CCApplication.h" -#include "CCGLViewImpl.h" +#include "platform/CCApplication.h" +//#include "platform/CCGLViewImpl.h" /** Position of the FPS diff --git a/cocos/base/CCDirector.h b/cocos/base/CCDirector.h index dc388b451a..8cf5f596ca 100644 --- a/cocos/base/CCDirector.h +++ b/cocos/base/CCDirector.h @@ -28,14 +28,14 @@ THE SOFTWARE. #ifndef __CCDIRECTOR_H__ #define __CCDIRECTOR_H__ -#include "base/CCPlatformMacros.h" +#include +#include "base/CCPlatformMacros.h" #include "base/CCRef.h" #include "base/CCVector.h" #include "2d/CCScene.h" -#include "CCGL.h" -#include #include "math/CCMath.h" +#include "platform/CCGL.h" #include "platform/CCGLView.h" NS_CC_BEGIN diff --git a/cocos/base/CCEventDispatcher.h b/cocos/base/CCEventDispatcher.h index 0c43ef1919..5293faebc0 100644 --- a/cocos/base/CCEventDispatcher.h +++ b/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 diff --git a/cocos/base/CCPlatformConfig.h b/cocos/base/CCPlatformConfig.h index 12c1735256..204732a6b6 100644 --- a/cocos/base/CCPlatformConfig.h +++ b/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 */ ////////////////////////////////////////////////////////////////////////// diff --git a/cocos/base/CCPlatformMacros.h b/cocos/base/CCPlatformMacros.h index 2e91a5fda2..0511fbfb01 100644 --- a/cocos/base/CCPlatformMacros.h +++ b/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 diff --git a/cocos/base/CCUserDefaultAndroid.cpp b/cocos/base/CCUserDefault-android.cpp similarity index 100% rename from cocos/base/CCUserDefaultAndroid.cpp rename to cocos/base/CCUserDefault-android.cpp diff --git a/cocos/base/CCUserDefault.mm b/cocos/base/CCUserDefault-apple.mm similarity index 100% rename from cocos/base/CCUserDefault.mm rename to cocos/base/CCUserDefault-apple.mm diff --git a/cocos/base/ZipUtils.h b/cocos/base/ZipUtils.h index 9920cd582c..19a56aace1 100644 --- a/cocos/base/ZipUtils.h +++ b/cocos/base/ZipUtils.h @@ -27,14 +27,14 @@ THE SOFTWARE. #include #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 diff --git a/cocos/base/atitc.h b/cocos/base/atitc.h index 1f1ad7a8ef..77fdf1ebb5 100644 --- a/cocos/base/atitc.h +++ b/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 { diff --git a/cocos/base/ccMacros.h b/cocos/base/ccMacros.h index cce54e8f83..ae174c680d 100644 --- a/cocos/base/ccMacros.h +++ b/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 diff --git a/cocos/base/ccTypes.h b/cocos/base/ccTypes.h index 7b2902f749..2d2b448852 100644 --- a/cocos/base/ccTypes.h +++ b/cocos/base/ccTypes.h @@ -32,8 +32,8 @@ THE SOFTWARE. #include "math/CCGeometry.h" #include "math/CCMath.h" -#include "CCGL.h" -#include "CCRef.h" +#include "base/CCRef.h" +#include "platform/CCGL.h" NS_CC_BEGIN diff --git a/cocos/base/s3tc.h b/cocos/base/s3tc.h index e6573d9849..1c3638e353 100644 --- a/cocos/base/s3tc.h +++ b/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 { diff --git a/cocos/cocos2d.h b/cocos/cocos2d.h index dd6fbb70a2..01893a48a6 100644 --- a/cocos/cocos2d.h +++ b/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/CCGLViewImpl.h" - #include "platform/ios/CCGL.h" - #include "platform/ios/CCStdC.h" + #include "platform/ios/CCApplication-ios.h" + #include "platform/ios/CCGLViewImpl-ios.h" + #include "platform/ios/CCGL-ios.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/CCGLViewImpl.h" - #include "platform/android/CCGL.h" - #include "platform/android/CCStdC.h" + #include "platform/android/CCApplication-android.h" + #include "platform/android/CCGLViewImpl-android.h" + #include "platform/android/CCGL-android.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/desktop/CCGLViewImpl.h" - #include "platform/win32/CCGL.h" - #include "platform/win32/CCStdC.h" + #include "platform/win32/CCApplication-win32.h" + #include "platform/desktop/CCGLViewImpl-win32.h" + #include "platform/win32/CCGL-win32.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.h" - #include "platform/mac/CCGL.h" - #include "platform/mac/CCStdC.h" + #include "platform/desktop/CCGLViewImpl-desktop.h" + #include "platform/mac/CCApplication-mac.h" + #include "platform/mac/CCGL-mac.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/desktop/CCGLViewImpl.h" - #include "platform/linux/CCGL.h" - #include "platform/linux/CCStdC.h" + #include "platform/linux/CCApplication-linux.h" + #include "platform/desktop/CCGLViewImpl-desktop.h" + #include "platform/linux/CCGL-linux.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" diff --git a/cocos/editor-support/cocostudio/CCActionFrameEasing.cpp b/cocos/editor-support/cocostudio/CCActionFrameEasing.cpp index 43e43dbc4e..92d56854ca 100644 --- a/cocos/editor-support/cocostudio/CCActionFrameEasing.cpp +++ b/cocos/editor-support/cocostudio/CCActionFrameEasing.cpp @@ -25,7 +25,7 @@ THE SOFTWARE. #include #include "cocostudio/CCActionFrameEasing.h" #include "cocostudio/DictionaryHelper.h" -#include "CCStdC.h" +#include "platform/CCStdC.h" namespace cocostudio { diff --git a/cocos/math/TransformUtils.h b/cocos/math/TransformUtils.h index eea629af11..67556359f3 100644 --- a/cocos/math/TransformUtils.h +++ b/cocos/math/TransformUtils.h @@ -28,7 +28,7 @@ THE SOFTWARE. #define __SUPPORT_TRANSFORM_UTILS_H__ // TODO: when in MAC or windows, it includes -#include "CCGL.h" +#include "platform/CCGL.h" #include "base/ccMacros.h" namespace cocos2d { diff --git a/cocos/network/WebSocket.h b/cocos/network/WebSocket.h index 5548ca50fa..3c2f3e1e65 100644 --- a/cocos/network/WebSocket.h +++ b/cocos/network/WebSocket.h @@ -30,11 +30,12 @@ #ifndef __CC_WEBSOCKET_H__ #define __CC_WEBSOCKET_H__ -#include "base/CCPlatformMacros.h" -#include "CCStdC.h" #include #include +#include "base/CCPlatformMacros.h" +#include "platform/CCStdC.h" + struct libwebsocket; struct libwebsocket_context; struct libwebsocket_protocols; diff --git a/cocos/platform/CCApplication.h b/cocos/platform/CCApplication.h new file mode 100644 index 0000000000..13049cb7c6 --- /dev/null +++ b/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__*/ diff --git a/cocos/platform/CCGL.h b/cocos/platform/CCGL.h new file mode 100644 index 0000000000..348a0c5542 --- /dev/null +++ b/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__*/ diff --git a/cocos/platform/CCImage.cpp b/cocos/platform/CCImage.cpp index d022327fc1..8de876aa2e 100644 --- a/cocos/platform/CCImage.cpp +++ b/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 diff --git a/cocos/platform/CCPlatformDefine.h b/cocos/platform/CCPlatformDefine.h new file mode 100644 index 0000000000..28a5df3217 --- /dev/null +++ b/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__*/ diff --git a/cocos/platform/CCStdC.h b/cocos/platform/CCStdC.h new file mode 100644 index 0000000000..a7e258856b --- /dev/null +++ b/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__*/ diff --git a/cocos/platform/android/Android.mk b/cocos/platform/android/Android.mk index bfc2e61672..415449727e 100644 --- a/cocos/platform/android/Android.mk +++ b/cocos/platform/android/Android.mk @@ -7,12 +7,12 @@ LOCAL_MODULE := cocos2dxandroid_static LOCAL_MODULE_FILENAME := libcocos2dandroid LOCAL_SRC_FILES := \ -CCApplication.cpp \ -CCCommon.cpp \ -CCDevice.cpp \ -CCGLViewImpl.cpp \ -CCFileUtilsAndroid.cpp \ -javaactivity.cpp \ +CCApplication-android.cpp \ +CCCommon-android.cpp \ +CCDevice-android.cpp \ +CCGLViewImpl-android.cpp \ +CCFileUtils-android.cpp \ +javaactivity-android.cpp \ jni/DPIJni.cpp \ jni/IMEJni.cpp \ jni/Java_org_cocos2dx_lib_Cocos2dxAccelerometer.cpp \ diff --git a/cocos/platform/android/CCApplication.cpp b/cocos/platform/android/CCApplication-android.cpp similarity index 100% rename from cocos/platform/android/CCApplication.cpp rename to cocos/platform/android/CCApplication-android.cpp diff --git a/cocos/platform/android/CCApplication.h b/cocos/platform/android/CCApplication-android.h similarity index 100% rename from cocos/platform/android/CCApplication.h rename to cocos/platform/android/CCApplication-android.h diff --git a/cocos/platform/android/CCCommon.cpp b/cocos/platform/android/CCCommon-android.cpp similarity index 100% rename from cocos/platform/android/CCCommon.cpp rename to cocos/platform/android/CCCommon-android.cpp diff --git a/cocos/platform/android/CCDevice.cpp b/cocos/platform/android/CCDevice-android.cpp similarity index 100% rename from cocos/platform/android/CCDevice.cpp rename to cocos/platform/android/CCDevice-android.cpp diff --git a/cocos/platform/android/CCFileUtilsAndroid.cpp b/cocos/platform/android/CCFileUtils-android.cpp similarity index 99% rename from cocos/platform/android/CCFileUtilsAndroid.cpp rename to cocos/platform/android/CCFileUtils-android.cpp index e4ff00dec6..04ef3e58a9 100644 --- a/cocos/platform/android/CCFileUtilsAndroid.cpp +++ b/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 -#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; diff --git a/cocos/platform/android/CCFileUtilsAndroid.h b/cocos/platform/android/CCFileUtils-android.h similarity index 100% rename from cocos/platform/android/CCFileUtilsAndroid.h rename to cocos/platform/android/CCFileUtils-android.h diff --git a/cocos/platform/android/CCGL.h b/cocos/platform/android/CCGL-android.h similarity index 100% rename from cocos/platform/android/CCGL.h rename to cocos/platform/android/CCGL-android.h diff --git a/cocos/platform/android/CCGLViewImpl.cpp b/cocos/platform/android/CCGLViewImpl-android.cpp similarity index 99% rename from cocos/platform/android/CCGLViewImpl.cpp rename to cocos/platform/android/CCGLViewImpl-android.cpp index 8431dcdcab..565bbe920a 100644 --- a/cocos/platform/android/CCGLViewImpl.cpp +++ b/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" diff --git a/cocos/platform/android/CCGLViewImpl.h b/cocos/platform/android/CCGLViewImpl-android.h similarity index 100% rename from cocos/platform/android/CCGLViewImpl.h rename to cocos/platform/android/CCGLViewImpl-android.h diff --git a/cocos/platform/android/CCPlatformDefine.h b/cocos/platform/android/CCPlatformDefine-android.h similarity index 100% rename from cocos/platform/android/CCPlatformDefine.h rename to cocos/platform/android/CCPlatformDefine-android.h diff --git a/cocos/platform/android/CCStdC.h b/cocos/platform/android/CCStdC-android.h similarity index 100% rename from cocos/platform/android/CCStdC.h rename to cocos/platform/android/CCStdC-android.h diff --git a/cocos/platform/android/java/project.properties b/cocos/platform/android/java/project.properties index 88ca83f9d0..6cd1f6a8ff 100644 --- a/cocos/platform/android/java/project.properties +++ b/cocos/platform/android/java/project.properties @@ -12,4 +12,4 @@ android.library=true # Project target. -target=android-10 +target=android-20 diff --git a/cocos/platform/android/javaactivity.cpp b/cocos/platform/android/javaactivity-android.cpp similarity index 98% rename from cocos/platform/android/javaactivity.cpp rename to cocos/platform/android/javaactivity-android.cpp index 74a26aed0c..e8542347d1 100644 --- a/cocos/platform/android/javaactivity.cpp +++ b/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 #include diff --git a/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp b/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp index ef9fac20a4..b7b25a937d 100644 --- a/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp +++ b/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp @@ -27,7 +27,7 @@ THE SOFTWARE. #include #include #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" diff --git a/cocos/platform/android/jni/TouchesJni.cpp b/cocos/platform/android/jni/TouchesJni.cpp index 69b759aabb..aaeaf89fc2 100644 --- a/cocos/platform/android/jni/TouchesJni.cpp +++ b/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 #include diff --git a/cocos/platform/apple/CCFileUtilsApple.h b/cocos/platform/apple/CCFileUtils-apple.h similarity index 100% rename from cocos/platform/apple/CCFileUtilsApple.h rename to cocos/platform/apple/CCFileUtils-apple.h diff --git a/cocos/platform/apple/CCFileUtilsApple.mm b/cocos/platform/apple/CCFileUtils-apple.mm similarity index 99% rename from cocos/platform/apple/CCFileUtilsApple.mm rename to cocos/platform/apple/CCFileUtils-apple.mm index b70a53bafe..ae81af2b7e 100644 --- a/cocos/platform/apple/CCFileUtilsApple.mm +++ b/cocos/platform/apple/CCFileUtils-apple.mm @@ -25,7 +25,7 @@ THE SOFTWARE. ****************************************************************************/ #import -#include "CCFileUtilsApple.h" +#include "CCFileUtils-apple.h" #include #include diff --git a/cocos/platform/apple/CCLock.cpp b/cocos/platform/apple/CCLock-apple.cpp similarity index 98% rename from cocos/platform/apple/CCLock.cpp rename to cocos/platform/apple/CCLock-apple.cpp index 0a6f29bfe5..4ac0698964 100644 --- a/cocos/platform/apple/CCLock.cpp +++ b/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 diff --git a/cocos/platform/apple/CCLock.h b/cocos/platform/apple/CCLock-apple.h similarity index 100% rename from cocos/platform/apple/CCLock.h rename to cocos/platform/apple/CCLock-apple.h diff --git a/cocos/platform/apple/CCThread.mm b/cocos/platform/apple/CCThread-apple.mm similarity index 100% rename from cocos/platform/apple/CCThread.mm rename to cocos/platform/apple/CCThread-apple.mm diff --git a/cocos/platform/desktop/CCGLViewImpl.cpp b/cocos/platform/desktop/CCGLViewImpl-desktop.cpp similarity index 99% rename from cocos/platform/desktop/CCGLViewImpl.cpp rename to cocos/platform/desktop/CCGLViewImpl-desktop.cpp index 90d1767062..94dd7beedc 100644 --- a/cocos/platform/desktop/CCGLViewImpl.cpp +++ b/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 "CCApplication.h" +#include "CCGLViewImpl-desktop.h" + +#include + +#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 NS_CC_BEGIN diff --git a/cocos/platform/desktop/CCGLViewImpl.h b/cocos/platform/desktop/CCGLViewImpl-desktop.h similarity index 100% rename from cocos/platform/desktop/CCGLViewImpl.h rename to cocos/platform/desktop/CCGLViewImpl-desktop.h diff --git a/cocos/platform/ios/CCApplication.h b/cocos/platform/ios/CCApplication-ios.h similarity index 100% rename from cocos/platform/ios/CCApplication.h rename to cocos/platform/ios/CCApplication-ios.h diff --git a/cocos/platform/ios/CCApplication.mm b/cocos/platform/ios/CCApplication-ios.mm similarity index 98% rename from cocos/platform/ios/CCApplication.mm rename to cocos/platform/ios/CCApplication-ios.mm index 374037b1b8..cbacf107e9 100644 --- a/cocos/platform/ios/CCApplication.mm +++ b/cocos/platform/ios/CCApplication-ios.mm @@ -29,8 +29,8 @@ #import -#import "CCGeometry.h" -#import "CCDirectorCaller.h" +#import "math/CCGeometry.h" +#import "CCDirectorCaller-ios.h" NS_CC_BEGIN diff --git a/cocos/platform/ios/CCCommon.mm b/cocos/platform/ios/CCCommon-ios.mm similarity index 100% rename from cocos/platform/ios/CCCommon.mm rename to cocos/platform/ios/CCCommon-ios.mm diff --git a/cocos/platform/ios/CCDevice.mm b/cocos/platform/ios/CCDevice-ios.mm similarity index 100% rename from cocos/platform/ios/CCDevice.mm rename to cocos/platform/ios/CCDevice-ios.mm diff --git a/cocos/platform/ios/CCDirectorCaller.h b/cocos/platform/ios/CCDirectorCaller-ios.h similarity index 100% rename from cocos/platform/ios/CCDirectorCaller.h rename to cocos/platform/ios/CCDirectorCaller-ios.h diff --git a/cocos/platform/ios/CCDirectorCaller.mm b/cocos/platform/ios/CCDirectorCaller-ios.mm similarity index 97% rename from cocos/platform/ios/CCDirectorCaller.mm rename to cocos/platform/ios/CCDirectorCaller-ios.mm index 3250816d26..386d1f1ff4 100644 --- a/cocos/platform/ios/CCDirectorCaller.mm +++ b/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 #import -#import "CCDirectorCaller.h" -#import "CCDirector.h" -#import "CCEAGLView.h" + +#import "base/CCDirector.h" +#import "CCEAGLView-ios.h" static id s_sharedDirectorCaller; diff --git a/cocos/platform/ios/CCEAGLView.h b/cocos/platform/ios/CCEAGLView-ios.h similarity index 99% rename from cocos/platform/ios/CCEAGLView.h rename to cocos/platform/ios/CCEAGLView-ios.h index 92c22a7371..ed5a690a98 100644 --- a/cocos/platform/ios/CCEAGLView.h +++ b/cocos/platform/ios/CCEAGLView-ios.h @@ -71,7 +71,7 @@ Copyright (C) 2008 Apple Inc. All Rights Reserved. #import #import -#import "CCESRenderer.h" +#import "CCESRenderer-ios.h" //CLASS INTERFACE: diff --git a/cocos/platform/ios/CCEAGLView.mm b/cocos/platform/ios/CCEAGLView-ios.mm similarity index 99% rename from cocos/platform/ios/CCEAGLView.mm rename to cocos/platform/ios/CCEAGLView-ios.mm index 87a02a566c..947e24838d 100644 --- a/cocos/platform/ios/CCEAGLView.mm +++ b/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 -#import "CCGLViewImpl.h" -#import "CCEAGLView.h" -#import "CCES2Renderer.h" -#import "CCDirector.h" -#import "CCSet.h" -#import "CCTouch.h" -#import "CCIMEDispatcher.h" -#import "OpenGL_Internal.h" + +#import "base/CCDirector.h" +#import "deprecated/CCSet.h" +#import "base/CCTouch.h" +#import "base/CCIMEDispatcher.h" +#import "CCGLViewImpl-ios.h" +#import "CCES2Renderer-ios.h" +#import "OpenGL_Internal-ios.h" + //CLASS IMPLEMENTATIONS: #define IOS_MAX_TOUCHES_COUNT 10 diff --git a/cocos/platform/ios/CCES2Renderer.h b/cocos/platform/ios/CCES2Renderer-ios.h similarity index 98% rename from cocos/platform/ios/CCES2Renderer.h rename to cocos/platform/ios/CCES2Renderer-ios.h index ca4751397d..66d9127af3 100644 --- a/cocos/platform/ios/CCES2Renderer.h +++ b/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.h" +#import "CCESRenderer-ios.h" + #import #import +#import "CCPlatformMacros.h" + @interface CCES2Renderer : NSObject { // The pixel dimensions of the CAEAGLLayer diff --git a/cocos/platform/ios/CCES2Renderer.m b/cocos/platform/ios/CCES2Renderer-ios.m similarity index 98% rename from cocos/platform/ios/CCES2Renderer.m rename to cocos/platform/ios/CCES2Renderer-ios.m index 4c687c2d38..c3c64cddb2 100644 --- a/cocos/platform/ios/CCES2Renderer.m +++ b/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 "OpenGL_Internal.h" +#import "CCES2Renderer-ios.h" +#import "base/CCPlatformMacros.h" +#import "OpenGL_Internal-ios.h" #if !defined(COCOS2D_DEBUG) || COCOS2D_DEBUG == 0 #define NSLog(...) do {} while (0) diff --git a/cocos/platform/ios/CCESRenderer.h b/cocos/platform/ios/CCESRenderer-ios.h similarity index 100% rename from cocos/platform/ios/CCESRenderer.h rename to cocos/platform/ios/CCESRenderer-ios.h diff --git a/cocos/platform/ios/CCGL.h b/cocos/platform/ios/CCGL-ios.h similarity index 100% rename from cocos/platform/ios/CCGL.h rename to cocos/platform/ios/CCGL-ios.h diff --git a/cocos/platform/ios/CCGLViewImpl.h b/cocos/platform/ios/CCGLViewImpl-ios.h similarity index 100% rename from cocos/platform/ios/CCGLViewImpl.h rename to cocos/platform/ios/CCGLViewImpl-ios.h diff --git a/cocos/platform/ios/CCGLViewImpl.mm b/cocos/platform/ios/CCGLViewImpl-ios.mm similarity index 98% rename from cocos/platform/ios/CCGLViewImpl.mm rename to cocos/platform/ios/CCGLViewImpl-ios.mm index 15522de773..b0bb0ed2c2 100644 --- a/cocos/platform/ios/CCGLViewImpl.mm +++ b/cocos/platform/ios/CCGLViewImpl-ios.mm @@ -28,9 +28,9 @@ #import -#include "CCEAGLView.h" -#include "CCDirectorCaller.h" -#include "CCGLViewImpl.h" +#include "CCEAGLView-ios.h" +#include "CCDirectorCaller-ios.h" +#include "CCGLViewImpl-ios.h" #include "CCSet.h" #include "base/CCTouch.h" diff --git a/cocos/platform/ios/CCImage.mm b/cocos/platform/ios/CCImage-ios.mm similarity index 100% rename from cocos/platform/ios/CCImage.mm rename to cocos/platform/ios/CCImage-ios.mm diff --git a/cocos/platform/ios/CCPlatformDefine.h b/cocos/platform/ios/CCPlatformDefine-ios.h similarity index 100% rename from cocos/platform/ios/CCPlatformDefine.h rename to cocos/platform/ios/CCPlatformDefine-ios.h diff --git a/cocos/platform/ios/CCStdC.h b/cocos/platform/ios/CCStdC-ios.h similarity index 100% rename from cocos/platform/ios/CCStdC.h rename to cocos/platform/ios/CCStdC-ios.h diff --git a/cocos/platform/ios/OpenGL_Internal.h b/cocos/platform/ios/OpenGL_Internal-ios.h similarity index 100% rename from cocos/platform/ios/OpenGL_Internal.h rename to cocos/platform/ios/OpenGL_Internal-ios.h diff --git a/cocos/platform/linux/CCApplication.cpp b/cocos/platform/linux/CCApplication-linux.cpp similarity index 100% rename from cocos/platform/linux/CCApplication.cpp rename to cocos/platform/linux/CCApplication-linux.cpp diff --git a/cocos/platform/linux/CCApplication.h b/cocos/platform/linux/CCApplication-linux.h similarity index 100% rename from cocos/platform/linux/CCApplication.h rename to cocos/platform/linux/CCApplication-linux.h diff --git a/cocos/platform/linux/CCCommon.cpp b/cocos/platform/linux/CCCommon-linux.cpp similarity index 100% rename from cocos/platform/linux/CCCommon.cpp rename to cocos/platform/linux/CCCommon-linux.cpp diff --git a/cocos/platform/linux/CCDevice.cpp b/cocos/platform/linux/CCDevice-linux.cpp similarity index 100% rename from cocos/platform/linux/CCDevice.cpp rename to cocos/platform/linux/CCDevice-linux.cpp diff --git a/cocos/platform/linux/CCFileUtilsLinux.cpp b/cocos/platform/linux/CCFileUtils-linux.cpp similarity index 100% rename from cocos/platform/linux/CCFileUtilsLinux.cpp rename to cocos/platform/linux/CCFileUtils-linux.cpp diff --git a/cocos/platform/linux/CCFileUtilsLinux.h b/cocos/platform/linux/CCFileUtils-linux.h similarity index 100% rename from cocos/platform/linux/CCFileUtilsLinux.h rename to cocos/platform/linux/CCFileUtils-linux.h diff --git a/cocos/platform/linux/CCGL.h b/cocos/platform/linux/CCGL-linux.h similarity index 100% rename from cocos/platform/linux/CCGL.h rename to cocos/platform/linux/CCGL-linux.h diff --git a/cocos/platform/linux/CCPlatformDefine.h b/cocos/platform/linux/CCPlatformDefine-linux.h similarity index 100% rename from cocos/platform/linux/CCPlatformDefine.h rename to cocos/platform/linux/CCPlatformDefine-linux.h diff --git a/cocos/platform/linux/CCStdC.cpp b/cocos/platform/linux/CCStdC-linux.cpp similarity index 100% rename from cocos/platform/linux/CCStdC.cpp rename to cocos/platform/linux/CCStdC-linux.cpp diff --git a/cocos/platform/linux/CCStdC.h b/cocos/platform/linux/CCStdC-linux.h similarity index 100% rename from cocos/platform/linux/CCStdC.h rename to cocos/platform/linux/CCStdC-linux.h diff --git a/cocos/platform/mac/CCApplication.h b/cocos/platform/mac/CCApplication-mac.h similarity index 100% rename from cocos/platform/mac/CCApplication.h rename to cocos/platform/mac/CCApplication-mac.h diff --git a/cocos/platform/mac/CCApplication.mm b/cocos/platform/mac/CCApplication-mac.mm similarity index 100% rename from cocos/platform/mac/CCApplication.mm rename to cocos/platform/mac/CCApplication-mac.mm diff --git a/cocos/platform/mac/CCCommon.mm b/cocos/platform/mac/CCCommon-mac.mm similarity index 100% rename from cocos/platform/mac/CCCommon.mm rename to cocos/platform/mac/CCCommon-mac.mm diff --git a/cocos/platform/mac/CCDevice.mm b/cocos/platform/mac/CCDevice-mac.mm similarity index 100% rename from cocos/platform/mac/CCDevice.mm rename to cocos/platform/mac/CCDevice-mac.mm diff --git a/cocos/platform/mac/CCGL.h b/cocos/platform/mac/CCGL-mac.h similarity index 100% rename from cocos/platform/mac/CCGL.h rename to cocos/platform/mac/CCGL-mac.h diff --git a/cocos/platform/mac/CCPlatformDefine.h b/cocos/platform/mac/CCPlatformDefine-mac.h similarity index 100% rename from cocos/platform/mac/CCPlatformDefine.h rename to cocos/platform/mac/CCPlatformDefine-mac.h diff --git a/cocos/platform/mac/CCStdC.h b/cocos/platform/mac/CCStdC-mac.h similarity index 100% rename from cocos/platform/mac/CCStdC.h rename to cocos/platform/mac/CCStdC-mac.h diff --git a/cocos/platform/win32/CCApplication.cpp b/cocos/platform/win32/CCApplication-win32.cpp similarity index 100% rename from cocos/platform/win32/CCApplication.cpp rename to cocos/platform/win32/CCApplication-win32.cpp diff --git a/cocos/platform/win32/CCApplication.h b/cocos/platform/win32/CCApplication-win32.h similarity index 100% rename from cocos/platform/win32/CCApplication.h rename to cocos/platform/win32/CCApplication-win32.h diff --git a/cocos/platform/win32/CCCommon.cpp b/cocos/platform/win32/CCCommon-win32.cpp similarity index 100% rename from cocos/platform/win32/CCCommon.cpp rename to cocos/platform/win32/CCCommon-win32.cpp diff --git a/cocos/platform/win32/CCDevice.cpp b/cocos/platform/win32/CCDevice-win32.cpp similarity index 100% rename from cocos/platform/win32/CCDevice.cpp rename to cocos/platform/win32/CCDevice-win32.cpp diff --git a/cocos/platform/win32/CCFileUtilsWin32.cpp b/cocos/platform/win32/CCFileUtils-win32.cpp similarity index 100% rename from cocos/platform/win32/CCFileUtilsWin32.cpp rename to cocos/platform/win32/CCFileUtils-win32.cpp diff --git a/cocos/platform/win32/CCFileUtilsWin32.h b/cocos/platform/win32/CCFileUtils-win32.h similarity index 100% rename from cocos/platform/win32/CCFileUtilsWin32.h rename to cocos/platform/win32/CCFileUtils-win32.h diff --git a/cocos/platform/win32/CCGL.h b/cocos/platform/win32/CCGL-win32.h similarity index 100% rename from cocos/platform/win32/CCGL.h rename to cocos/platform/win32/CCGL-win32.h diff --git a/cocos/platform/win32/CCPlatformDefine.h b/cocos/platform/win32/CCPlatformDefine-win32.h similarity index 100% rename from cocos/platform/win32/CCPlatformDefine.h rename to cocos/platform/win32/CCPlatformDefine-win32.h diff --git a/cocos/platform/win32/CCStdC.cpp b/cocos/platform/win32/CCStdC-win32.cpp similarity index 100% rename from cocos/platform/win32/CCStdC.cpp rename to cocos/platform/win32/CCStdC-win32.cpp diff --git a/cocos/platform/win32/CCStdC.h b/cocos/platform/win32/CCStdC-win32.h similarity index 100% rename from cocos/platform/win32/CCStdC.h rename to cocos/platform/win32/CCStdC-win32.h diff --git a/cocos/platform/wp8/CCGLViewImpl.cpp b/cocos/platform/wp8/CCGLViewImpl-wp8.cpp similarity index 100% rename from cocos/platform/wp8/CCGLViewImpl.cpp rename to cocos/platform/wp8/CCGLViewImpl-wp8.cpp diff --git a/cocos/platform/wp8/CCGLViewImpl.h b/cocos/platform/wp8/CCGLViewImpl-wp8.h similarity index 100% rename from cocos/platform/wp8/CCGLViewImpl.h rename to cocos/platform/wp8/CCGLViewImpl-wp8.h diff --git a/cocos/renderer/CCGLProgram.h b/cocos/renderer/CCGLProgram.h index d73519562f..3d31d6f077 100644 --- a/cocos/renderer/CCGLProgram.h +++ b/cocos/renderer/CCGLProgram.h @@ -35,7 +35,7 @@ THE SOFTWARE. #include "base/ccMacros.h" #include "base/CCRef.h" #include "base/ccTypes.h" -#include "CCGL.h" +#include "platform/CCGL.h" #include "math/CCMath.h" NS_CC_BEGIN diff --git a/cocos/renderer/CCRenderer.h b/cocos/renderer/CCRenderer.h index 35da31e076..db7d74651c 100644 --- a/cocos/renderer/CCRenderer.h +++ b/cocos/renderer/CCRenderer.h @@ -32,7 +32,7 @@ #include "base/CCPlatformMacros.h" #include "renderer/CCRenderCommand.h" #include "renderer/CCGLProgram.h" -#include "CCGL.h" +#include "platform/CCGL.h" NS_CC_BEGIN diff --git a/cocos/renderer/CCTexture2D.cpp b/cocos/renderer/CCTexture2D.cpp index 1857c24d43..b0e0d182e9 100644 --- a/cocos/renderer/CCTexture2D.cpp +++ b/cocos/renderer/CCTexture2D.cpp @@ -33,7 +33,7 @@ THE SOFTWARE. #include "renderer/CCTexture2D.h" -#include "CCGL.h" +#include "platform/CCGL.h" #include "platform/CCImage.h" #include "base/ccUtils.h" #include "platform/CCDevice.h" diff --git a/cocos/renderer/CCTextureAtlas.cpp b/cocos/renderer/CCTextureAtlas.cpp index c62cdb164f..4893a11e0a 100644 --- a/cocos/renderer/CCTextureAtlas.cpp +++ b/cocos/renderer/CCTextureAtlas.cpp @@ -40,7 +40,7 @@ THE SOFTWARE. #include "renderer/ccGLStateCache.h" #include "renderer/CCRenderer.h" #include "renderer/CCTexture2D.h" -#include "CCGL.h" +#include "platform/CCGL.h" #include "deprecated/CCString.h" diff --git a/cocos/renderer/CCVertexIndexBuffer.h b/cocos/renderer/CCVertexIndexBuffer.h index 6454c17cd1..1eaffe76f3 100644 --- a/cocos/renderer/CCVertexIndexBuffer.h +++ b/cocos/renderer/CCVertexIndexBuffer.h @@ -27,7 +27,7 @@ #include #include "base/CCRef.h" -#include "CCGL.h" +#include "platform/CCGL.h" NS_CC_BEGIN diff --git a/cocos/renderer/ccGLStateCache.h b/cocos/renderer/ccGLStateCache.h index 8428cc77ff..bb77f763a9 100644 --- a/cocos/renderer/ccGLStateCache.h +++ b/cocos/renderer/ccGLStateCache.h @@ -30,7 +30,7 @@ THE SOFTWARE. #include -#include "CCGL.h" +#include "platform/CCGL.h" #include "base/CCPlatformMacros.h" NS_CC_BEGIN diff --git a/cocos/renderer/ccShaders.h b/cocos/renderer/ccShaders.h index fd619bf31f..be82d4e12f 100644 --- a/cocos/renderer/ccShaders.h +++ b/cocos/renderer/ccShaders.h @@ -26,7 +26,7 @@ THE SOFTWARE. #ifndef __CCSHADER_H__ #define __CCSHADER_H__ -#include "CCGL.h" +#include "platform/CCGL.h" #include "base/CCPlatformMacros.h" NS_CC_BEGIN diff --git a/cocos/ui/Android.mk b/cocos/ui/Android.mk index a76af6d91a..3969bd138f 100644 --- a/cocos/ui/Android.mk +++ b/cocos/ui/Android.mk @@ -28,13 +28,13 @@ UIRichText.cpp \ UIHBox.cpp \ UIVBox.cpp \ UIRelativeBox.cpp \ -UIVideoPlayerAndroid.cpp \ +UIVideoPlayer-android.cpp \ UIDeprecated.cpp \ UIScale9Sprite.cpp \ UIWebView.cpp \ -UIWebViewImpl_android.cpp \ +UIWebViewImpl-android.cpp \ UIEditBox/UIEditBox.cpp \ -UIEditBox/UIEditBoxImplAndroid.cpp \ +UIEditBox/UIEditBoxImpl-android.cpp \ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/.. \ diff --git a/cocos/ui/UIEditBox/UIEditBoxImplAndroid.cpp b/cocos/ui/UIEditBox/UIEditBoxImpl-android.cpp similarity index 99% rename from cocos/ui/UIEditBox/UIEditBoxImplAndroid.cpp rename to cocos/ui/UIEditBox/UIEditBoxImpl-android.cpp index 338b8defd3..864feaa7de 100644 --- a/cocos/ui/UIEditBox/UIEditBoxImplAndroid.cpp +++ b/cocos/ui/UIEditBox/UIEditBoxImpl-android.cpp @@ -23,14 +23,15 @@ THE SOFTWARE. ****************************************************************************/ -#include "UIEditBoxImplAndroid.h" +#include "UIEditBoxImpl-android.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) #include "UIEditBox.h" #include "jni/Java_org_cocos2dx_lib_Cocos2dxBitmap.h" #include "jni/Java_org_cocos2dx_lib_Cocos2dxHelper.h" - +#include "2d/CCLabel.h" +#include "base/ccUTF8.h" NS_CC_BEGIN diff --git a/cocos/ui/UIEditBox/UIEditBoxImplAndroid.h b/cocos/ui/UIEditBox/UIEditBoxImpl-android.h similarity index 99% rename from cocos/ui/UIEditBox/UIEditBoxImplAndroid.h rename to cocos/ui/UIEditBox/UIEditBoxImpl-android.h index a4adb68944..11a2a0b7e9 100644 --- a/cocos/ui/UIEditBox/UIEditBoxImplAndroid.h +++ b/cocos/ui/UIEditBox/UIEditBoxImpl-android.h @@ -34,6 +34,8 @@ NS_CC_BEGIN +class Label; + namespace ui { class EditBox; diff --git a/cocos/ui/UIEditBox/UIEditBoxImplIOS.h b/cocos/ui/UIEditBox/UIEditBoxImpl-ios.h similarity index 100% rename from cocos/ui/UIEditBox/UIEditBoxImplIOS.h rename to cocos/ui/UIEditBox/UIEditBoxImpl-ios.h diff --git a/cocos/ui/UIEditBox/UIEditBoxImplIOS.mm b/cocos/ui/UIEditBox/UIEditBoxImpl-ios.mm similarity index 99% rename from cocos/ui/UIEditBox/UIEditBoxImplIOS.mm rename to cocos/ui/UIEditBox/UIEditBoxImpl-ios.mm index a2456ed125..da5a1b0c45 100644 --- a/cocos/ui/UIEditBox/UIEditBoxImplIOS.mm +++ b/cocos/ui/UIEditBox/UIEditBoxImpl-ios.mm @@ -22,14 +22,14 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "UIEditBoxImplIOS.h" +#include "UIEditBoxImpl-ios.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) #define kLabelZOrder 9999 #include "UIEditBox.h" -#import "CCEAGLView.h" +#import "platform/ios/CCEAGLView-ios.h" #define getEditBoxImplIOS() ((cocos2d::ui::EditBoxImplIOS*)editBox_) diff --git a/cocos/ui/UIEditBox/UIEditBoxImplMac.h b/cocos/ui/UIEditBox/UIEditBoxImpl-mac.h similarity index 100% rename from cocos/ui/UIEditBox/UIEditBoxImplMac.h rename to cocos/ui/UIEditBox/UIEditBoxImpl-mac.h diff --git a/cocos/ui/UIEditBox/UIEditBoxImplMac.mm b/cocos/ui/UIEditBox/UIEditBoxImpl-mac.mm similarity index 99% rename from cocos/ui/UIEditBox/UIEditBoxImplMac.mm rename to cocos/ui/UIEditBox/UIEditBoxImpl-mac.mm index 87bf88e615..2896d983e4 100644 --- a/cocos/ui/UIEditBox/UIEditBoxImplMac.mm +++ b/cocos/ui/UIEditBox/UIEditBoxImpl-mac.mm @@ -23,11 +23,11 @@ THE SOFTWARE. ****************************************************************************/ -#include "UIEditBoxImplMac.h" -#include "base/CCDirector.h" +#include "UIEditBoxImpl-mac.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_MAC) +#include "base/CCDirector.h" #include "UIEditBox.h" diff --git a/cocos/ui/UIEditBox/UIEditBoxImplNone.cpp b/cocos/ui/UIEditBox/UIEditBoxImpl-stub.cpp similarity index 100% rename from cocos/ui/UIEditBox/UIEditBoxImplNone.cpp rename to cocos/ui/UIEditBox/UIEditBoxImpl-stub.cpp diff --git a/cocos/ui/UIEditBox/UIEditBoxImplWin.cpp b/cocos/ui/UIEditBox/UIEditBoxImpl-win32.cpp similarity index 99% rename from cocos/ui/UIEditBox/UIEditBoxImplWin.cpp rename to cocos/ui/UIEditBox/UIEditBoxImpl-win32.cpp index 46cd7e825d..1ecc777ed4 100644 --- a/cocos/ui/UIEditBox/UIEditBoxImplWin.cpp +++ b/cocos/ui/UIEditBox/UIEditBoxImpl-win32.cpp @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "UIEditBoxImplWin.h" +#include "UIEditBoxImpl-win32.h" #include "base/CCPlatformConfig.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) diff --git a/cocos/ui/UIEditBox/UIEditBoxImplWin.h b/cocos/ui/UIEditBox/UIEditBoxImpl-win32.h similarity index 100% rename from cocos/ui/UIEditBox/UIEditBoxImplWin.h rename to cocos/ui/UIEditBox/UIEditBoxImpl-win32.h diff --git a/cocos/ui/UIEditBox/UIEditBoxImplWp8.cpp b/cocos/ui/UIEditBox/UIEditBoxImpl-wp8.cpp similarity index 99% rename from cocos/ui/UIEditBox/UIEditBoxImplWp8.cpp rename to cocos/ui/UIEditBox/UIEditBoxImpl-wp8.cpp index 4675c1005a..26f1154b93 100644 --- a/cocos/ui/UIEditBox/UIEditBoxImplWp8.cpp +++ b/cocos/ui/UIEditBox/UIEditBoxImpl-wp8.cpp @@ -25,7 +25,7 @@ THE SOFTWARE. #include "base/CCPlatformConfig.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) -#include "UIEditBoxImplWp8.h" +#include "UIEditBoxImpl-wp8.h" #include "UIEditBox.h" #include "CCGLViewImpl.h" #include "base/CCScriptSupport.h" diff --git a/cocos/ui/UIEditBox/UIEditBoxImplWp8.h b/cocos/ui/UIEditBox/UIEditBoxImpl-wp8.h similarity index 100% rename from cocos/ui/UIEditBox/UIEditBoxImplWp8.h rename to cocos/ui/UIEditBox/UIEditBoxImpl-wp8.h diff --git a/cocos/ui/UIVideoPlayerAndroid.cpp b/cocos/ui/UIVideoPlayer-android.cpp similarity index 100% rename from cocos/ui/UIVideoPlayerAndroid.cpp rename to cocos/ui/UIVideoPlayer-android.cpp diff --git a/cocos/ui/UIVideoPlayerIOS.mm b/cocos/ui/UIVideoPlayer-ios.mm similarity index 99% rename from cocos/ui/UIVideoPlayerIOS.mm rename to cocos/ui/UIVideoPlayer-ios.mm index 51cda4a9b7..94749f2422 100644 --- a/cocos/ui/UIVideoPlayerIOS.mm +++ b/cocos/ui/UIVideoPlayer-ios.mm @@ -24,14 +24,15 @@ #include "UIVideoPlayer.h" -#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) +#if CC_TARGET_PLATFORM == CC_PLATFORM_IOS using namespace cocos2d::experimental::ui; //------------------------------------------------------------------------------------- -#include "CCEAGLView.h" + +#include "platform/ios/CCEAGLView-ios.h" #import #include "base/CCDirector.h" -#include "CCFileUtils.h" +#include "platform/CCFileUtils.h" @interface UIVideoViewWrapperIos : NSObject diff --git a/cocos/ui/UIWebView.cpp b/cocos/ui/UIWebView.cpp index bf09a92c73..9a3aa24263 100644 --- a/cocos/ui/UIWebView.cpp +++ b/cocos/ui/UIWebView.cpp @@ -25,7 +25,7 @@ #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) -#include "UIWebViewImpl_android.h" +#include "UIWebViewImpl-android.h" #include "UIWebView-inl.h" diff --git a/cocos/ui/UIWebView.mm b/cocos/ui/UIWebView.mm index 9958d6a4d1..1f8ef6ae80 100644 --- a/cocos/ui/UIWebView.mm +++ b/cocos/ui/UIWebView.mm @@ -26,7 +26,7 @@ #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) -#include "UIWebViewImpl_iOS.h" +#include "UIWebViewImpl-ios.h" #include "UIWebView-inl.h" #endif diff --git a/cocos/ui/UIWebViewImpl_android.cpp b/cocos/ui/UIWebViewImpl-android.cpp similarity index 99% rename from cocos/ui/UIWebViewImpl_android.cpp rename to cocos/ui/UIWebViewImpl-android.cpp index 30e1313068..adfb5d57f6 100644 --- a/cocos/ui/UIWebViewImpl_android.cpp +++ b/cocos/ui/UIWebViewImpl-android.cpp @@ -24,7 +24,7 @@ #ifdef __ANDROID__ -#include "UIWebViewImpl_android.h" +#include "UIWebViewImpl-android.h" #include #include diff --git a/cocos/ui/UIWebViewImpl_android.h b/cocos/ui/UIWebViewImpl-android.h similarity index 100% rename from cocos/ui/UIWebViewImpl_android.h rename to cocos/ui/UIWebViewImpl-android.h diff --git a/cocos/ui/UIWebViewImpl_iOS.h b/cocos/ui/UIWebViewImpl-ios.h similarity index 100% rename from cocos/ui/UIWebViewImpl_iOS.h rename to cocos/ui/UIWebViewImpl-ios.h diff --git a/cocos/ui/UIWebViewImpl_iOS.mm b/cocos/ui/UIWebViewImpl-ios.mm similarity index 98% rename from cocos/ui/UIWebViewImpl_iOS.mm rename to cocos/ui/UIWebViewImpl-ios.mm index 116b116975..e1fefa80bf 100644 --- a/cocos/ui/UIWebViewImpl_iOS.mm +++ b/cocos/ui/UIWebViewImpl-ios.mm @@ -24,11 +24,11 @@ #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS -#include "UIWebViewImpl_iOS.h" +#include "UIWebViewImpl-ios.h" #include "renderer/CCRenderer.h" -#include "CCDirector.h" -#include "CCGLView.h" -#include "CCEAGLView.h" +#include "base/CCDirector.h" +#include "platform/CCGLView.h" +#include "platform/ios/CCEAGLView-ios.h" #include "platform/CCFileUtils.h" #include "ui/UIWebView.h" diff --git a/tests/cpp-empty-test/proj.android/project.properties b/tests/cpp-empty-test/proj.android/project.properties index 572f7c30de..e8b0265294 100644 --- a/tests/cpp-empty-test/proj.android/project.properties +++ b/tests/cpp-empty-test/proj.android/project.properties @@ -8,6 +8,6 @@ # project structure. # Project target. -target=android-10 +target=android-20 android.library.reference.1=../../../cocos/platform/android/java diff --git a/tests/cpp-empty-test/proj.ios/AppController.mm b/tests/cpp-empty-test/proj.ios/AppController.mm index fb70c76a07..4310cbe5a6 100644 --- a/tests/cpp-empty-test/proj.ios/AppController.mm +++ b/tests/cpp-empty-test/proj.ios/AppController.mm @@ -24,8 +24,8 @@ #import #import "AppController.h" #import "cocos2d.h" +#import "platform/ios/CCEAGLView-ios.h" #import "AppDelegate.h" -#import "CCEAGLView.h" #import "RootViewController.h" @implementation AppController diff --git a/tests/cpp-tests/Classes/Sprite3DTest/DrawNode3D.cpp b/tests/cpp-tests/Classes/Sprite3DTest/DrawNode3D.cpp index a3062bb59a..34d3c257fc 100644 --- a/tests/cpp-tests/Classes/Sprite3DTest/DrawNode3D.cpp +++ b/tests/cpp-tests/Classes/Sprite3DTest/DrawNode3D.cpp @@ -23,16 +23,6 @@ ****************************************************************************/ #include "DrawNode3D.h" -#include "CCGL.h" -#include "base/CCEventType.h" -#include "base/CCConfiguration.h" -#include "renderer/CCCustomCommand.h" -#include "renderer/CCRenderer.h" -#include "renderer/CCGLProgramState.h" -#include "renderer/ccGLStateCache.h" -#include "base/CCDirector.h" -#include "base/CCEventListenerCustom.h" -#include "base/CCEventDispatcher.h" NS_CC_BEGIN diff --git a/tests/cpp-tests/Classes/Sprite3DTest/DrawNode3D.h b/tests/cpp-tests/Classes/Sprite3DTest/DrawNode3D.h index 240bb025ee..9b8b1093c0 100644 --- a/tests/cpp-tests/Classes/Sprite3DTest/DrawNode3D.h +++ b/tests/cpp-tests/Classes/Sprite3DTest/DrawNode3D.h @@ -25,9 +25,7 @@ #ifndef __DRAW_NODE_3D_H__ #define __DRAW_NODE_3D_H__ -#include "2d/CCNode.h" -#include "base/ccTypes.h" -#include "renderer/CCCustomCommand.h" +#include "cocos2d.h" NS_CC_BEGIN diff --git a/tests/cpp-tests/proj.ios/Classes/testsAppDelegate.mm b/tests/cpp-tests/proj.ios/Classes/testsAppDelegate.mm index 7df7890aa2..ba3aa6218c 100644 --- a/tests/cpp-tests/proj.ios/Classes/testsAppDelegate.mm +++ b/tests/cpp-tests/proj.ios/Classes/testsAppDelegate.mm @@ -25,7 +25,7 @@ #import "testsAppDelegate.h" -#import "CCEAGLView.h" +#import "platform/ios/CCEAGLView-ios.h" #import "cocos2d.h" #import "AppDelegate.h" #import "RootViewController.h" diff --git a/tests/lua-empty-test/project/Classes/AppDelegate.h b/tests/lua-empty-test/project/Classes/AppDelegate.h index 41d0b2ca88..1d6b047898 100644 --- a/tests/lua-empty-test/project/Classes/AppDelegate.h +++ b/tests/lua-empty-test/project/Classes/AppDelegate.h @@ -1,7 +1,7 @@ #ifndef _APP_DELEGATE_H_ #define _APP_DELEGATE_H_ -#include "CCApplication.h" +#include "platform/CCApplication.h" /** @brief The cocos2d Application. diff --git a/tests/lua-empty-test/project/proj.ios/AppController.mm b/tests/lua-empty-test/project/proj.ios/AppController.mm index 7cfd72062b..67ab321d93 100644 --- a/tests/lua-empty-test/project/proj.ios/AppController.mm +++ b/tests/lua-empty-test/project/proj.ios/AppController.mm @@ -24,7 +24,7 @@ #import #import "AppController.h" #import "cocos2d.h" -#import "CCEAGLView.h" +#import "platform/ios/CCEAGLView-ios.h" #import "AppDelegate.h" #import "RootViewController.h" diff --git a/tests/lua-tests/project/proj.ios_mac/ios/AppController.mm b/tests/lua-tests/project/proj.ios_mac/ios/AppController.mm index 12f7bd601f..4eb2ff3083 100644 --- a/tests/lua-tests/project/proj.ios_mac/ios/AppController.mm +++ b/tests/lua-tests/project/proj.ios_mac/ios/AppController.mm @@ -24,7 +24,7 @@ #import #import "AppController.h" #import "cocos2d.h" -#import "CCEAGLView.h" +#import "platform/ios/CCEAGLView-ios.h" #import "AppDelegate.h" #import "RootViewController.h"