From 6f3ca63f003eea84244c1493d6a3f6c94b0908d5 Mon Sep 17 00:00:00 2001 From: Ricardo Quesada Date: Tue, 9 Sep 2014 17:17:07 -0700 Subject: [PATCH] Moved base/CCPlatform* -> platform/CCPlatform* --- build/cocos2d_libs.xcodeproj/project.pbxproj | 36 +++++++++---------- cocos/2d/CCAnimation.h | 2 +- cocos/2d/CCFontAtlas.h | 2 +- cocos/2d/CCLabelTextFormatter.h | 2 +- cocos/2d/CCTweenFunction.h | 2 +- cocos/3d/CCAnimationCurve.h | 2 +- cocos/3d/CCBundleReader.h | 2 +- cocos/3d/CCSprite3D.cpp | 2 +- cocos/base/CCConsole.cpp | 2 +- cocos/base/CCConsole.h | 2 +- cocos/base/CCController-iOS.mm | 2 +- cocos/base/CCData.h | 2 +- cocos/base/CCDataVisitor.h | 2 +- cocos/base/CCDirector.h | 2 +- cocos/base/CCEvent.h | 2 +- cocos/base/CCEventController.h | 2 +- cocos/base/CCEventDispatcher.h | 2 +- cocos/base/CCEventListener.h | 2 +- cocos/base/CCEventListenerController.h | 2 +- cocos/base/CCRef.h | 2 +- cocos/base/CCUserDefault-android.cpp | 2 +- cocos/base/CCUserDefault-apple.mm | 2 +- cocos/base/CCUserDefault.h | 2 +- cocos/base/CCValue.h | 2 +- cocos/base/ObjectFactory.h | 2 +- cocos/base/ZipUtils.h | 4 +-- cocos/base/base64.h | 2 +- cocos/base/ccConfig.h | 2 +- cocos/base/ccRandom.h | 2 +- cocos/base/ccUTF8.h | 2 +- cocos/cocos2d.cpp | 2 +- cocos/cocos2d.h | 4 +-- .../cocostudio/CCInputDelegate.h | 2 +- .../cocostudio/CCSpriteFrameCacheHelper.h | 2 +- .../cocostudio/DictionaryHelper.cpp | 2 +- cocos/math/CCAffineTransform.h | 2 +- cocos/math/CCGeometry.h | 2 +- cocos/math/CCMathBase.h | 2 +- cocos/network/SocketIO.h | 2 +- cocos/network/WebSocket.h | 2 +- .../chipmunk/CCPhysicsBodyInfo_chipmunk.h | 2 +- .../chipmunk/CCPhysicsContactInfo_chipmunk.h | 2 +- .../chipmunk/CCPhysicsHelper_chipmunk.h | 2 +- .../chipmunk/CCPhysicsJointInfo_chipmunk.h | 2 +- .../chipmunk/CCPhysicsShapeInfo_chipmunk.h | 2 +- .../chipmunk/CCPhysicsWorldInfo_chipmunk.h | 2 +- cocos/platform/CCApplication.h | 2 +- cocos/platform/CCApplicationProtocol.h | 2 +- cocos/platform/CCCommon.h | 2 +- cocos/platform/CCDevice.h | 2 +- cocos/platform/CCFileUtils.h | 2 +- cocos/platform/CCGL.h | 2 +- cocos/{base => platform}/CCPlatformConfig.h | 0 cocos/platform/CCPlatformDefine.h | 2 +- cocos/{base => platform}/CCPlatformMacros.h | 2 +- cocos/platform/CCSAXParser.h | 2 +- cocos/platform/CCStdC.h | 2 +- cocos/platform/CCThread.h | 2 +- cocos/platform/apple/CCFileUtils-apple.h | 2 +- cocos/platform/apple/CCLock-apple.h | 2 +- cocos/platform/ios/CCApplication-ios.h | 2 +- cocos/platform/ios/CCCommon-ios.mm | 2 +- cocos/platform/ios/CCDevice-ios.mm | 2 +- cocos/platform/ios/CCDirectorCaller-ios.h | 2 +- cocos/platform/ios/CCDirectorCaller-ios.mm | 2 +- cocos/platform/ios/CCEAGLView-ios.h | 2 +- cocos/platform/ios/CCEAGLView-ios.mm | 2 +- cocos/platform/ios/CCES2Renderer-ios.h | 2 +- cocos/platform/ios/CCES2Renderer-ios.m | 4 +-- cocos/platform/ios/CCESRenderer-ios.h | 4 +-- cocos/platform/ios/CCGL-ios.h | 2 +- cocos/platform/ios/CCGLViewImpl-ios.h | 2 +- cocos/platform/ios/CCGLViewImpl-ios.mm | 2 +- cocos/platform/ios/CCImage-ios.mm | 2 +- cocos/platform/ios/CCPlatformDefine-ios.h | 2 +- cocos/platform/ios/CCStdC-ios.h | 4 +-- cocos/platform/ios/OpenGL_Internal-ios.h | 2 +- cocos/platform/mac/CCApplication-mac.h | 2 +- cocos/platform/mac/CCApplication-mac.mm | 2 +- cocos/platform/mac/CCCommon-mac.mm | 2 +- cocos/platform/mac/CCDevice-mac.mm | 2 +- cocos/platform/mac/CCGL-mac.h | 2 +- cocos/platform/mac/CCPlatformDefine-mac.h | 2 +- cocos/platform/mac/CCStdC-mac.h | 4 +-- cocos/renderer/CCRenderCommand.h | 2 +- cocos/renderer/CCRenderCommandPool.h | 2 +- cocos/renderer/CCRenderer.h | 2 +- cocos/renderer/CCTexture2D.cpp | 2 +- cocos/renderer/ccGLStateCache.h | 2 +- cocos/renderer/ccShaders.h | 2 +- .../local-storage/LocalStorage-android.cpp | 2 +- cocos/storage/local-storage/LocalStorage.cpp | 2 +- cocos/ui/UIDeprecated.h | 2 +- cocos/ui/UIEditBox/UIEditBoxImpl-android.h | 2 +- cocos/ui/UIEditBox/UIEditBoxImpl-ios.h | 2 +- cocos/ui/UIEditBox/UIEditBoxImpl-mac.h | 2 +- cocos/ui/UIEditBox/UIEditBoxImpl-win32.cpp | 2 +- cocos/ui/UIEditBox/UIEditBoxImpl-win32.h | 2 +- cocos/ui/UIEditBox/UIEditBoxImpl-wp8.cpp | 2 +- cocos/ui/UIEditBox/UIEditBoxImpl-wp8.h | 2 +- cocos/ui/UIHelper.h | 2 +- cocos/ui/UIScale9Sprite.h | 2 +- cocos/ui/UIWebView.mm | 2 +- .../cpp-tests/proj.android/project.properties | 2 +- 104 files changed, 126 insertions(+), 126 deletions(-) rename cocos/{base => platform}/CCPlatformConfig.h (100%) rename cocos/{base => platform}/CCPlatformMacros.h (99%) diff --git a/build/cocos2d_libs.xcodeproj/project.pbxproj b/build/cocos2d_libs.xcodeproj/project.pbxproj index 4f12f69323..ffcf926cf0 100644 --- a/build/cocos2d_libs.xcodeproj/project.pbxproj +++ b/build/cocos2d_libs.xcodeproj/project.pbxproj @@ -1328,8 +1328,6 @@ 1AAF5850180E40B9000584C8 /* LocalStorage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AAF584C180E40B9000584C8 /* LocalStorage.cpp */; }; 1AAF5851180E40B9000584C8 /* LocalStorage.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF584D180E40B9000584C8 /* LocalStorage.h */; }; 1AAF5852180E40B9000584C8 /* LocalStorage.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF584D180E40B9000584C8 /* LocalStorage.h */; }; - 1AAF5853180E40B9000584C8 /* LocalStorageAndroid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AAF584E180E40B9000584C8 /* LocalStorageAndroid.cpp */; }; - 1AAF5854180E40B9000584C8 /* LocalStorageAndroid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AAF584E180E40B9000584C8 /* LocalStorageAndroid.cpp */; }; 1ABA68AE1888D700007D1BB4 /* CCFontCharMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1ABA68AC1888D700007D1BB4 /* CCFontCharMap.cpp */; }; 1ABA68AF1888D700007D1BB4 /* CCFontCharMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1ABA68AC1888D700007D1BB4 /* CCFontCharMap.cpp */; }; 1ABA68B01888D700007D1BB4 /* CCFontCharMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABA68AD1888D700007D1BB4 /* CCFontCharMap.h */; }; @@ -1486,6 +1484,12 @@ 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 */; }; + 50643BDE19BFCCA400EF68ED /* LocalStorage-android.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50643BDD19BFCCA300EF68ED /* LocalStorage-android.cpp */; }; + 50643BDF19BFCCA400EF68ED /* LocalStorage-android.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50643BDD19BFCCA300EF68ED /* LocalStorage-android.cpp */; }; + 50643BE219BFCF1800EF68ED /* CCPlatformConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 50643BE019BFCF1800EF68ED /* CCPlatformConfig.h */; }; + 50643BE319BFCF1800EF68ED /* CCPlatformConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 50643BE019BFCF1800EF68ED /* CCPlatformConfig.h */; }; + 50643BE419BFCF1800EF68ED /* CCPlatformMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 50643BE119BFCF1800EF68ED /* CCPlatformMacros.h */; }; + 50643BE519BFCF1800EF68ED /* CCPlatformMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 50643BE119BFCF1800EF68ED /* CCPlatformMacros.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 */; }; @@ -1705,10 +1709,6 @@ 50ABBE8C1925AB6F00A911A9 /* CCNS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDF71925AB6E00A911A9 /* CCNS.cpp */; }; 50ABBE8D1925AB6F00A911A9 /* CCNS.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDF81925AB6E00A911A9 /* CCNS.h */; }; 50ABBE8E1925AB6F00A911A9 /* CCNS.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDF81925AB6E00A911A9 /* CCNS.h */; }; - 50ABBE8F1925AB6F00A911A9 /* CCPlatformConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDF91925AB6E00A911A9 /* CCPlatformConfig.h */; }; - 50ABBE901925AB6F00A911A9 /* CCPlatformConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDF91925AB6E00A911A9 /* CCPlatformConfig.h */; }; - 50ABBE911925AB6F00A911A9 /* CCPlatformMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDFA1925AB6E00A911A9 /* CCPlatformMacros.h */; }; - 50ABBE921925AB6F00A911A9 /* CCPlatformMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDFA1925AB6E00A911A9 /* CCPlatformMacros.h */; }; 50ABBE931925AB6F00A911A9 /* CCProfiling.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDFB1925AB6E00A911A9 /* CCProfiling.cpp */; }; 50ABBE941925AB6F00A911A9 /* CCProfiling.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDFB1925AB6E00A911A9 /* CCProfiling.cpp */; }; 50ABBE951925AB6F00A911A9 /* CCProfiling.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDFC1925AB6E00A911A9 /* CCProfiling.h */; }; @@ -2199,7 +2199,6 @@ 1AAF584B180E40B9000584C8 /* Android.mk */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Android.mk; sourceTree = ""; }; 1AAF584C180E40B9000584C8 /* LocalStorage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LocalStorage.cpp; sourceTree = ""; }; 1AAF584D180E40B9000584C8 /* LocalStorage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LocalStorage.h; sourceTree = ""; }; - 1AAF584E180E40B9000584C8 /* LocalStorageAndroid.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LocalStorageAndroid.cpp; sourceTree = ""; }; 1ABA68AC1888D700007D1BB4 /* CCFontCharMap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCFontCharMap.cpp; sourceTree = ""; }; 1ABA68AD1888D700007D1BB4 /* CCFontCharMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCFontCharMap.h; sourceTree = ""; }; 1AC026991914068200FA920D /* ConvertUTF.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ConvertUTF.h; sourceTree = ""; }; @@ -2664,6 +2663,9 @@ 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 = ""; }; + 50643BDD19BFCCA300EF68ED /* LocalStorage-android.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "LocalStorage-android.cpp"; sourceTree = ""; }; + 50643BE019BFCF1800EF68ED /* CCPlatformConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCPlatformConfig.h; sourceTree = ""; }; + 50643BE119BFCF1800EF68ED /* CCPlatformMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCPlatformMacros.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 = ""; }; @@ -2781,8 +2783,6 @@ 50ABBDF61925AB6E00A911A9 /* CCMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCMap.h; path = ../base/CCMap.h; sourceTree = ""; }; 50ABBDF71925AB6E00A911A9 /* CCNS.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCNS.cpp; path = ../base/CCNS.cpp; sourceTree = ""; }; 50ABBDF81925AB6E00A911A9 /* CCNS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCNS.h; path = ../base/CCNS.h; sourceTree = ""; }; - 50ABBDF91925AB6E00A911A9 /* CCPlatformConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCPlatformConfig.h; path = ../base/CCPlatformConfig.h; sourceTree = ""; }; - 50ABBDFA1925AB6E00A911A9 /* CCPlatformMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCPlatformMacros.h; path = ../base/CCPlatformMacros.h; sourceTree = ""; }; 50ABBDFB1925AB6E00A911A9 /* CCProfiling.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCProfiling.cpp; path = ../base/CCProfiling.cpp; sourceTree = ""; }; 50ABBDFC1925AB6E00A911A9 /* CCProfiling.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCProfiling.h; path = ../base/CCProfiling.h; sourceTree = ""; }; 50ABBDFD1925AB6E00A911A9 /* CCProtocols.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCProtocols.h; path = ../base/CCProtocols.h; sourceTree = ""; }; @@ -3205,8 +3205,6 @@ 50ABBDF61925AB6E00A911A9 /* CCMap.h */, 50ABBDF71925AB6E00A911A9 /* CCNS.cpp */, 50ABBDF81925AB6E00A911A9 /* CCNS.h */, - 50ABBDF91925AB6E00A911A9 /* CCPlatformConfig.h */, - 50ABBDFA1925AB6E00A911A9 /* CCPlatformMacros.h */, 50ABBDFB1925AB6E00A911A9 /* CCProfiling.cpp */, 50ABBDFC1925AB6E00A911A9 /* CCProfiling.h */, 50ABBDFD1925AB6E00A911A9 /* CCProtocols.h */, @@ -3835,10 +3833,10 @@ 1AAF584A180E40B9000584C8 /* local-storage */ = { isa = PBXGroup; children = ( + 50643BDD19BFCCA300EF68ED /* LocalStorage-android.cpp */, 1AAF584B180E40B9000584C8 /* Android.mk */, 1AAF584C180E40B9000584C8 /* LocalStorage.cpp */, 1AAF584D180E40B9000584C8 /* LocalStorage.h */, - 1AAF584E180E40B9000584C8 /* LocalStorageAndroid.cpp */, ); path = "local-storage"; sourceTree = ""; @@ -4741,6 +4739,8 @@ 50ABBF2D1926664700A911A9 /* desktop */, 50ABBF4E1926664700A911A9 /* mac */, 50ABBF1A1926664700A911A9 /* apple */, + 50643BE019BFCF1800EF68ED /* CCPlatformConfig.h */, + 50643BE119BFCF1800EF68ED /* CCPlatformMacros.h */, 5091A7A219BFABA800AC8789 /* CCPlatformDefine.h */, 50643BD319BFAECF00EF68ED /* CCGL.h */, 50643BD719BFAF4400EF68ED /* CCApplication.h */, @@ -5188,6 +5188,7 @@ 1A570204180BCBD40088DEC7 /* CCClippingNode.h in Headers */, 15AE1A7B19AAD40300C27E9E /* b2PolygonContact.h in Headers */, 15AE1A2919AAD3D500C27E9E /* b2Collision.h in Headers */, + 50643BE419BFCF1800EF68ED /* CCPlatformMacros.h in Headers */, 15AE184219AAD2F700C27E9E /* CCSprite3D.h in Headers */, 15AE18A019AAD33D00C27E9E /* CCNodeLoaderLibrary.h in Headers */, 1A01C6A618F58F7500EFE3A6 /* CCNotificationCenter.h in Headers */, @@ -5229,6 +5230,7 @@ 1A57022F180BCC1A0088DEC7 /* CCParticleSystemQuad.h in Headers */, 15AE188519AAD33D00C27E9E /* CCBSequence.h in Headers */, 15AE1AE219AAD42500C27E9E /* cpDampedRotarySpring.h in Headers */, + 50643BE219BFCF1800EF68ED /* CCPlatformConfig.h in Headers */, 5034CA49191D591100CE6051 /* ccShader_Label_df.frag in Headers */, 292DB14119B4574100A80320 /* UIEditBoxImpl.h in Headers */, 1A01C68C18F57BE800EFE3A6 /* CCDeprecated.h in Headers */, @@ -5258,7 +5260,6 @@ 1A570294180BCCAB0088DEC7 /* CCAnimation.h in Headers */, 50ABBD421925AB0000A911A9 /* CCMathBase.h in Headers */, 1A570298180BCCAB0088DEC7 /* CCAnimationCache.h in Headers */, - 50ABBE911925AB6F00A911A9 /* CCPlatformMacros.h in Headers */, 50ABC05D1926664800A911A9 /* CCApplication-mac.h in Headers */, 15AE190019AAD35000C27E9E /* CCComAudio.h in Headers */, 15AE190419AAD35000C27E9E /* CCComRender.h in Headers */, @@ -5362,7 +5363,6 @@ 3EA3EDBE1991CDFA00645534 /* CCCamera.h in Headers */, 15AE1B6619AADA9900C27E9E /* UIImageView.h in Headers */, 15AE1BB419AADFEF00C27E9E /* HttpResponse.h in Headers */, - 50ABBE8F1925AB6F00A911A9 /* CCPlatformConfig.h in Headers */, 15AE1A8519AAD40300C27E9E /* b2Joint.h in Headers */, 15AE1A8D19AAD40300C27E9E /* b2RevoluteJoint.h in Headers */, 50ABBE291925AB6F00A911A9 /* CCAutoreleasePool.h in Headers */, @@ -5543,6 +5543,7 @@ 50ABBEC21925AB6F00A911A9 /* CCValue.h in Headers */, 50ABBECA1925AB6F00A911A9 /* firePngData.h in Headers */, B257B4511989D5E800D9A687 /* CCPrimitive.h in Headers */, + 50643BE319BFCF1800EF68ED /* CCPlatformConfig.h in Headers */, 15AE181F19AAD2F700C27E9E /* CCBundle3DData.h in Headers */, 15AE1B0D19AAD42500C27E9E /* cpVect.h in Headers */, 15AE193119AAD35100C27E9E /* CCActionManagerEx.h in Headers */, @@ -5696,7 +5697,7 @@ 15AE1B8E19AADA9A00C27E9E /* UIDeprecated.h in Headers */, 15AE1A3919AAD3D500C27E9E /* Box2D.h in Headers */, 50ABBECE1925AB6F00A911A9 /* s3tc.h in Headers */, - 50ABBE901925AB6F00A911A9 /* CCPlatformConfig.h in Headers */, + 50643BE519BFCF1800EF68ED /* CCPlatformMacros.h in Headers */, 15AE1BFA19AAE01E00C27E9E /* CCControlSwitch.h in Headers */, 15AE182F19AAD2F700C27E9E /* CCMeshVertexIndexData.h in Headers */, 15AE19F419AAD3A700C27E9E /* EventData.h in Headers */, @@ -5919,7 +5920,6 @@ 15AE1AA419AAD40300C27E9E /* b2ContactManager.h in Headers */, B276EF601988D1D500CD400F /* CCVertexIndexData.h in Headers */, 50ABBD5F1925AB0000A911A9 /* Vec3.h in Headers */, - 50ABBE921925AB6F00A911A9 /* CCPlatformMacros.h in Headers */, 50ABBE821925AB6F00A911A9 /* CCEventType.h in Headers */, 15AE194C19AAD35100C27E9E /* CCComRender.h in Headers */, 1AAF5852180E40B9000584C8 /* LocalStorage.h in Headers */, @@ -6130,6 +6130,7 @@ 1A570061180BC5A10088DEC7 /* CCAction.cpp in Sources */, 15AE1BDC19AAE01E00C27E9E /* CCControlUtils.cpp in Sources */, 50ABBEC51925AB6F00A911A9 /* etc1.cpp in Sources */, + 50643BDE19BFCCA400EF68ED /* LocalStorage-android.cpp in Sources */, 15AE1B5B19AADA9900C27E9E /* UITextAtlas.cpp in Sources */, 1A570065180BC5A10088DEC7 /* CCActionCamera.cpp in Sources */, 50ABBEAB1925AB6F00A911A9 /* ccTypes.cpp in Sources */, @@ -6424,7 +6425,6 @@ 15AE1B1D19AAD43700C27E9E /* cpBBTree.c in Sources */, 15AE1A2A19AAD3D500C27E9E /* b2Distance.cpp in Sources */, 50ABBE6D1925AB6F00A911A9 /* CCEventListenerKeyboard.cpp in Sources */, - 1AAF5853180E40B9000584C8 /* LocalStorageAndroid.cpp in Sources */, 15AE1B1B19AAD43700C27E9E /* cpArray.c in Sources */, 15AE190B19AAD35000C27E9E /* CCDisplayFactory.cpp in Sources */, 1A9DCA27180E6955007A3AD4 /* CCGLBufferedNode.cpp in Sources */, @@ -6650,6 +6650,7 @@ 15AE18AF19AAD33D00C27E9E /* CCBKeyframe.cpp in Sources */, 15AE19FB19AAD3A700C27E9E /* AnimationStateData.cpp in Sources */, 15AE1A0119AAD3A700C27E9E /* Attachment.cpp in Sources */, + 50643BDF19BFCCA400EF68ED /* LocalStorage-android.cpp in Sources */, 15AE1B4819AAD43700C27E9E /* cpVect.c in Sources */, 15AE1B3E19AAD43700C27E9E /* cpHashSet.c in Sources */, 50ABBED81925AB6F00A911A9 /* ZipUtils.cpp in Sources */, @@ -6898,7 +6899,6 @@ 15AE192E19AAD35100C27E9E /* CCActionFrameEasing.cpp in Sources */, 15AE195519AAD35100C27E9E /* CCDisplayManager.cpp in Sources */, 15AE1BA719AADFDF00C27E9E /* UIRelativeBox.cpp in Sources */, - 1AAF5854180E40B9000584C8 /* LocalStorageAndroid.cpp in Sources */, 15AE1ACE19AAD40300C27E9E /* b2PulleyJoint.cpp in Sources */, 1A9DCA28180E6955007A3AD4 /* CCGLBufferedNode.cpp in Sources */, 15AE1B4719AAD43700C27E9E /* cpSweep1D.c in Sources */, diff --git a/cocos/2d/CCAnimation.h b/cocos/2d/CCAnimation.h index 39b35e8f63..5b7027fe9a 100644 --- a/cocos/2d/CCAnimation.h +++ b/cocos/2d/CCAnimation.h @@ -27,7 +27,7 @@ THE SOFTWARE. #ifndef __CC_ANIMATION_H__ #define __CC_ANIMATION_H__ -#include "base/CCPlatformConfig.h" +#include "platform/CCPlatformConfig.h" #include "base/CCRef.h" #include "base/CCValue.h" #include "base/CCVector.h" diff --git a/cocos/2d/CCFontAtlas.h b/cocos/2d/CCFontAtlas.h index d2a43a2375..5c8d920eef 100644 --- a/cocos/2d/CCFontAtlas.h +++ b/cocos/2d/CCFontAtlas.h @@ -28,7 +28,7 @@ #include #include -#include "base/CCPlatformMacros.h" +#include "platform/CCPlatformMacros.h" #include "base/CCRef.h" #include "platform/CCStdC.h" // ssize_t on windows diff --git a/cocos/2d/CCLabelTextFormatter.h b/cocos/2d/CCLabelTextFormatter.h index 664310a8b3..abd9155e59 100644 --- a/cocos/2d/CCLabelTextFormatter.h +++ b/cocos/2d/CCLabelTextFormatter.h @@ -26,7 +26,7 @@ #ifndef _CCLabelTextFormatter_h_ #define _CCLabelTextFormatter_h_ -#include "base/CCPlatformMacros.h" +#include "platform/CCPlatformMacros.h" NS_CC_BEGIN diff --git a/cocos/2d/CCTweenFunction.h b/cocos/2d/CCTweenFunction.h index b825e30221..b934842c03 100644 --- a/cocos/2d/CCTweenFunction.h +++ b/cocos/2d/CCTweenFunction.h @@ -25,7 +25,7 @@ THE SOFTWARE. #ifndef __CCTWEENFUNCTION_H__ #define __CCTWEENFUNCTION_H__ -#include "base/CCPlatformMacros.h" +#include "platform/CCPlatformMacros.h" NS_CC_BEGIN diff --git a/cocos/3d/CCAnimationCurve.h b/cocos/3d/CCAnimationCurve.h index 0f2b9eb0c4..07966a0bfd 100644 --- a/cocos/3d/CCAnimationCurve.h +++ b/cocos/3d/CCAnimationCurve.h @@ -26,7 +26,7 @@ #include -#include "base/CCPlatformMacros.h" +#include "platform/CCPlatformMacros.h" #include "base/CCRef.h" #include "math/CCMath.h" diff --git a/cocos/3d/CCBundleReader.h b/cocos/3d/CCBundleReader.h index b332fa4c80..90fb10694b 100644 --- a/cocos/3d/CCBundleReader.h +++ b/cocos/3d/CCBundleReader.h @@ -29,7 +29,7 @@ #include #include "base/CCRef.h" -#include "base/CCPlatformMacros.h" +#include "platform/CCPlatformMacros.h" #include "base/CCConsole.h" NS_CC_BEGIN diff --git a/cocos/3d/CCSprite3D.cpp b/cocos/3d/CCSprite3D.cpp index ed9a3baf89..a17b5b02d4 100644 --- a/cocos/3d/CCSprite3D.cpp +++ b/cocos/3d/CCSprite3D.cpp @@ -31,7 +31,7 @@ #include "3d/CCMesh.h" #include "base/CCDirector.h" -#include "base/CCPlatformMacros.h" +#include "platform/CCPlatformMacros.h" #include "base/ccMacros.h" #include "platform/CCFileUtils.h" #include "renderer/CCTextureCache.h" diff --git a/cocos/base/CCConsole.cpp b/cocos/base/CCConsole.cpp index 262c8e9891..827217ed0f 100644 --- a/cocos/base/CCConsole.cpp +++ b/cocos/base/CCConsole.cpp @@ -56,7 +56,7 @@ #include "base/CCDirector.h" #include "base/CCScheduler.h" -#include "base/CCPlatformConfig.h" +#include "platform/CCPlatformConfig.h" #include "base/CCConfiguration.h" #include "2d/CCScene.h" #include "platform/CCFileUtils.h" diff --git a/cocos/base/CCConsole.h b/cocos/base/CCConsole.h index 9ab18ff443..7e05a4bf29 100644 --- a/cocos/base/CCConsole.h +++ b/cocos/base/CCConsole.h @@ -49,7 +49,7 @@ typedef SSIZE_T ssize_t; #include "base/CCRef.h" #include "base/ccMacros.h" -#include "base/CCPlatformMacros.h" +#include "platform/CCPlatformMacros.h" NS_CC_BEGIN diff --git a/cocos/base/CCController-iOS.mm b/cocos/base/CCController-iOS.mm index 881477bd1c..971a93d477 100644 --- a/cocos/base/CCController-iOS.mm +++ b/cocos/base/CCController-iOS.mm @@ -24,7 +24,7 @@ ****************************************************************************/ #include "CCController.h" -#include "base/CCPlatformConfig.h" +#include "platform/CCPlatformConfig.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) #include "ccMacros.h" diff --git a/cocos/base/CCData.h b/cocos/base/CCData.h index f442e32a5f..435e51eac0 100644 --- a/cocos/base/CCData.h +++ b/cocos/base/CCData.h @@ -26,7 +26,7 @@ #ifndef __CCDATA_H__ #define __CCDATA_H__ -#include "base/CCPlatformMacros.h" +#include "platform/CCPlatformMacros.h" #include // for ssize_t on android #include // for ssize_t on linux #include "platform/CCStdC.h" // for ssize_t on window diff --git a/cocos/base/CCDataVisitor.h b/cocos/base/CCDataVisitor.h index e40620e1f9..ee25ff980f 100644 --- a/cocos/base/CCDataVisitor.h +++ b/cocos/base/CCDataVisitor.h @@ -25,7 +25,7 @@ #ifndef __CCDATAVISITOR_H__ #define __CCDATAVISITOR_H__ -#include "base/CCPlatformMacros.h" +#include "platform/CCPlatformMacros.h" #include NS_CC_BEGIN diff --git a/cocos/base/CCDirector.h b/cocos/base/CCDirector.h index 8cf5f596ca..d786885574 100644 --- a/cocos/base/CCDirector.h +++ b/cocos/base/CCDirector.h @@ -30,7 +30,7 @@ THE SOFTWARE. #include -#include "base/CCPlatformMacros.h" +#include "platform/CCPlatformMacros.h" #include "base/CCRef.h" #include "base/CCVector.h" #include "2d/CCScene.h" diff --git a/cocos/base/CCEvent.h b/cocos/base/CCEvent.h index 8280a6c2af..08f1cbd01f 100644 --- a/cocos/base/CCEvent.h +++ b/cocos/base/CCEvent.h @@ -27,7 +27,7 @@ #define __CCEVENT_H__ #include "base/CCRef.h" -#include "base/CCPlatformMacros.h" +#include "platform/CCPlatformMacros.h" NS_CC_BEGIN diff --git a/cocos/base/CCEventController.h b/cocos/base/CCEventController.h index d8190a0b8e..14b3c0870a 100644 --- a/cocos/base/CCEventController.h +++ b/cocos/base/CCEventController.h @@ -26,7 +26,7 @@ #ifndef __cocos2d_libs__EventController__ #define __cocos2d_libs__EventController__ -#include "base/CCPlatformMacros.h" +#include "platform/CCPlatformMacros.h" #include "base/CCEvent.h" NS_CC_BEGIN diff --git a/cocos/base/CCEventDispatcher.h b/cocos/base/CCEventDispatcher.h index 5293faebc0..1f3349e101 100644 --- a/cocos/base/CCEventDispatcher.h +++ b/cocos/base/CCEventDispatcher.h @@ -31,7 +31,7 @@ #include #include -#include "base/CCPlatformMacros.h" +#include "platform/CCPlatformMacros.h" #include "base/CCEventListener.h" #include "base/CCEvent.h" #include "platform/CCStdC.h" diff --git a/cocos/base/CCEventListener.h b/cocos/base/CCEventListener.h index 321b16f57a..aecfd92a8d 100644 --- a/cocos/base/CCEventListener.h +++ b/cocos/base/CCEventListener.h @@ -29,7 +29,7 @@ #include #include -#include "base/CCPlatformMacros.h" +#include "platform/CCPlatformMacros.h" #include "base/CCRef.h" NS_CC_BEGIN diff --git a/cocos/base/CCEventListenerController.h b/cocos/base/CCEventListenerController.h index ebb3f09e50..cdcefd023a 100644 --- a/cocos/base/CCEventListenerController.h +++ b/cocos/base/CCEventListenerController.h @@ -26,7 +26,7 @@ #ifndef __cocos2d_libs__EventListenerController__ #define __cocos2d_libs__EventListenerController__ -#include "base/CCPlatformMacros.h" +#include "platform/CCPlatformMacros.h" #include "base/CCEventListener.h" NS_CC_BEGIN diff --git a/cocos/base/CCRef.h b/cocos/base/CCRef.h index 283fd1cae7..5246f4feae 100644 --- a/cocos/base/CCRef.h +++ b/cocos/base/CCRef.h @@ -26,7 +26,7 @@ THE SOFTWARE. #ifndef __BASE_CCREF_H__ #define __BASE_CCREF_H__ -#include "base/CCPlatformMacros.h" +#include "platform/CCPlatformMacros.h" #include "base/ccConfig.h" #define CC_USE_MEM_LEAK_DETECTION 0 diff --git a/cocos/base/CCUserDefault-android.cpp b/cocos/base/CCUserDefault-android.cpp index 9240747e5c..c6bc9f9a57 100644 --- a/cocos/base/CCUserDefault-android.cpp +++ b/cocos/base/CCUserDefault-android.cpp @@ -23,7 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ #include "base/CCUserDefault.h" -#include "base/CCPlatformConfig.h" +#include "platform/CCPlatformConfig.h" #include "base/ccUtils.h" #include "platform/CCCommon.h" #include "base/base64.h" diff --git a/cocos/base/CCUserDefault-apple.mm b/cocos/base/CCUserDefault-apple.mm index 6492d8cd77..0f004e200c 100644 --- a/cocos/base/CCUserDefault-apple.mm +++ b/cocos/base/CCUserDefault-apple.mm @@ -23,7 +23,7 @@ THE SOFTWARE. ****************************************************************************/ -#include "base/CCPlatformConfig.h" +#include "platform/CCPlatformConfig.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_MAC) #import diff --git a/cocos/base/CCUserDefault.h b/cocos/base/CCUserDefault.h index 8ba6bcf7d8..858b60b18f 100644 --- a/cocos/base/CCUserDefault.h +++ b/cocos/base/CCUserDefault.h @@ -25,7 +25,7 @@ THE SOFTWARE. #ifndef __SUPPORT_CCUSERDEFAULT_H__ #define __SUPPORT_CCUSERDEFAULT_H__ -#include "base/CCPlatformMacros.h" +#include "platform/CCPlatformMacros.h" #include #include "base/CCData.h" diff --git a/cocos/base/CCValue.h b/cocos/base/CCValue.h index a3cf561ce0..98531422f5 100644 --- a/cocos/base/CCValue.h +++ b/cocos/base/CCValue.h @@ -25,7 +25,7 @@ #ifndef __cocos2d_libs__CCValue__ #define __cocos2d_libs__CCValue__ -#include "base/CCPlatformMacros.h" +#include "platform/CCPlatformMacros.h" #include "base/ccMacros.h" #include #include diff --git a/cocos/base/ObjectFactory.h b/cocos/base/ObjectFactory.h index c9342f2c9d..c2ade91ba8 100644 --- a/cocos/base/ObjectFactory.h +++ b/cocos/base/ObjectFactory.h @@ -29,7 +29,7 @@ THE SOFTWARE. #include #include #include "base/CCRef.h" -#include "base/CCPlatformMacros.h" +#include "platform/CCPlatformMacros.h" NS_CC_BEGIN diff --git a/cocos/base/ZipUtils.h b/cocos/base/ZipUtils.h index 19a56aace1..0ab769383e 100644 --- a/cocos/base/ZipUtils.h +++ b/cocos/base/ZipUtils.h @@ -26,8 +26,8 @@ THE SOFTWARE. #define __SUPPORT_ZIPUTILS_H__ #include -#include "base/CCPlatformConfig.h" -#include "base/CCPlatformMacros.h" +#include "platform/CCPlatformConfig.h" +#include "platform/CCPlatformMacros.h" #include "platform/CCPlatformDefine.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) diff --git a/cocos/base/base64.h b/cocos/base/base64.h index 1180c365ce..2e0d9e7b51 100644 --- a/cocos/base/base64.h +++ b/cocos/base/base64.h @@ -26,7 +26,7 @@ THE SOFTWARE. #ifndef __SUPPORT_BASE64_H__ #define __SUPPORT_BASE64_H__ -#include "base/CCPlatformMacros.h" +#include "platform/CCPlatformMacros.h" #ifdef __cplusplus extern "C" { diff --git a/cocos/base/ccConfig.h b/cocos/base/ccConfig.h index a44ede24ef..443da7a9ef 100644 --- a/cocos/base/ccConfig.h +++ b/cocos/base/ccConfig.h @@ -28,7 +28,7 @@ THE SOFTWARE. #ifndef __CCCONFIG_H__ #define __CCCONFIG_H__ -#include "base/CCPlatformConfig.h" +#include "platform/CCPlatformConfig.h" /** @file diff --git a/cocos/base/ccRandom.h b/cocos/base/ccRandom.h index 272da902b2..a2b5c8983d 100644 --- a/cocos/base/ccRandom.h +++ b/cocos/base/ccRandom.h @@ -26,7 +26,7 @@ THE SOFTWARE. #ifndef __ccRandom_H_ #define __ccRandom_H_ -#include "base/CCPlatformMacros.h" +#include "platform/CCPlatformMacros.h" #include diff --git a/cocos/base/ccUTF8.h b/cocos/base/ccUTF8.h index f9561efa09..bd6e7c831d 100644 --- a/cocos/base/ccUTF8.h +++ b/cocos/base/ccUTF8.h @@ -26,7 +26,7 @@ #ifndef __cocos2dx__ccUTF8__ #define __cocos2dx__ccUTF8__ -#include "base/CCPlatformMacros.h" +#include "platform/CCPlatformMacros.h" #include #include diff --git a/cocos/cocos2d.cpp b/cocos/cocos2d.cpp index adc8a7ac05..23ca3561dc 100644 --- a/cocos/cocos2d.cpp +++ b/cocos/cocos2d.cpp @@ -25,7 +25,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "base/CCPlatformMacros.h" +#include "platform/CCPlatformMacros.h" NS_CC_BEGIN diff --git a/cocos/cocos2d.h b/cocos/cocos2d.h index 01893a48a6..328ea8d43f 100644 --- a/cocos/cocos2d.h +++ b/cocos/cocos2d.h @@ -175,8 +175,8 @@ THE SOFTWARE. #include "platform/CCImage.h" #include "platform/CCSAXParser.h" #include "platform/CCThread.h" -#include "base/CCPlatformConfig.h" -#include "base/CCPlatformMacros.h" +#include "platform/CCPlatformConfig.h" +#include "platform/CCPlatformMacros.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) #include "platform/ios/CCApplication-ios.h" diff --git a/cocos/editor-support/cocostudio/CCInputDelegate.h b/cocos/editor-support/cocostudio/CCInputDelegate.h index 15b1233bb0..a9f6f24a79 100644 --- a/cocos/editor-support/cocostudio/CCInputDelegate.h +++ b/cocos/editor-support/cocostudio/CCInputDelegate.h @@ -25,7 +25,7 @@ THE SOFTWARE. #ifndef __CC_EXTENTIONS_CCINPUTDELEGATE_H__ #define __CC_EXTENTIONS_CCINPUTDELEGATE_H__ -#include "base/CCPlatformMacros.h" +#include "platform/CCPlatformMacros.h" #include "base/CCTouch.h" #include "base/CCEvent.h" #include "base/ccTypes.h" diff --git a/cocos/editor-support/cocostudio/CCSpriteFrameCacheHelper.h b/cocos/editor-support/cocostudio/CCSpriteFrameCacheHelper.h index d0e6fa9585..20db0f5aba 100644 --- a/cocos/editor-support/cocostudio/CCSpriteFrameCacheHelper.h +++ b/cocos/editor-support/cocostudio/CCSpriteFrameCacheHelper.h @@ -24,7 +24,7 @@ THE SOFTWARE. #ifndef __CCSPRITEFRAMECACHEHELPER_H__ #define __CCSPRITEFRAMECACHEHELPER_H__ -#include "base/CCPlatformMacros.h" +#include "platform/CCPlatformMacros.h" #include "cocostudio/CCArmatureDefine.h" #include "cocostudio/CocosStudioExport.h" #include diff --git a/cocos/editor-support/cocostudio/DictionaryHelper.cpp b/cocos/editor-support/cocostudio/DictionaryHelper.cpp index 232290505b..7dad513cb6 100644 --- a/cocos/editor-support/cocostudio/DictionaryHelper.cpp +++ b/cocos/editor-support/cocostudio/DictionaryHelper.cpp @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "base/CCPlatformMacros.h" +#include "platform/CCPlatformMacros.h" #include "cocostudio/DictionaryHelper.h" namespace cocostudio { diff --git a/cocos/math/CCAffineTransform.h b/cocos/math/CCAffineTransform.h index a055fa5bfd..83164ff2e3 100644 --- a/cocos/math/CCAffineTransform.h +++ b/cocos/math/CCAffineTransform.h @@ -26,7 +26,7 @@ THE SOFTWARE. #ifndef __MATH_CCAFFINETRANSFORM_H__ #define __MATH_CCAFFINETRANSFORM_H__ -#include "base/CCPlatformMacros.h" +#include "platform/CCPlatformMacros.h" #include "math/CCGeometry.h" #include "math/CCMath.h" diff --git a/cocos/math/CCGeometry.h b/cocos/math/CCGeometry.h index 1ea35bf059..272a7d7b02 100644 --- a/cocos/math/CCGeometry.h +++ b/cocos/math/CCGeometry.h @@ -28,7 +28,7 @@ THE SOFTWARE. #include -#include "base/CCPlatformMacros.h" +#include "platform/CCPlatformMacros.h" #include "base/ccMacros.h" #include "math/CCMath.h" diff --git a/cocos/math/CCMathBase.h b/cocos/math/CCMathBase.h index ee777d52e2..76978b1531 100644 --- a/cocos/math/CCMathBase.h +++ b/cocos/math/CCMathBase.h @@ -3,7 +3,7 @@ #include #include -#include "base/CCPlatformMacros.h" +#include "platform/CCPlatformMacros.h" #define MATH_DEG_TO_RAD(x) ((x) * 0.0174532925f) #define MATH_RAD_TO_DEG(x) ((x)* 57.29577951f) diff --git a/cocos/network/SocketIO.h b/cocos/network/SocketIO.h index cab25c2c71..152a8c5c72 100644 --- a/cocos/network/SocketIO.h +++ b/cocos/network/SocketIO.h @@ -59,7 +59,7 @@ in the onClose method the pointer should be set to NULL or used to connect to a #ifndef __CC_SOCKETIO_H__ #define __CC_SOCKETIO_H__ -#include "base/CCPlatformMacros.h" +#include "platform/CCPlatformMacros.h" #include "base/CCMap.h" #include diff --git a/cocos/network/WebSocket.h b/cocos/network/WebSocket.h index 3c2f3e1e65..b5f0048976 100644 --- a/cocos/network/WebSocket.h +++ b/cocos/network/WebSocket.h @@ -33,7 +33,7 @@ #include #include -#include "base/CCPlatformMacros.h" +#include "platform/CCPlatformMacros.h" #include "platform/CCStdC.h" struct libwebsocket; diff --git a/cocos/physics/chipmunk/CCPhysicsBodyInfo_chipmunk.h b/cocos/physics/chipmunk/CCPhysicsBodyInfo_chipmunk.h index f26e327158..389e342077 100644 --- a/cocos/physics/chipmunk/CCPhysicsBodyInfo_chipmunk.h +++ b/cocos/physics/chipmunk/CCPhysicsBodyInfo_chipmunk.h @@ -28,7 +28,7 @@ #include "base/ccConfig.h" #if CC_USE_PHYSICS -#include "base/CCPlatformMacros.h" +#include "platform/CCPlatformMacros.h" #include "base/CCRef.h" struct cpBody; diff --git a/cocos/physics/chipmunk/CCPhysicsContactInfo_chipmunk.h b/cocos/physics/chipmunk/CCPhysicsContactInfo_chipmunk.h index 13dde02524..20cdb952f6 100644 --- a/cocos/physics/chipmunk/CCPhysicsContactInfo_chipmunk.h +++ b/cocos/physics/chipmunk/CCPhysicsContactInfo_chipmunk.h @@ -28,7 +28,7 @@ #include "base/ccConfig.h" #if CC_USE_PHYSICS -#include "base/CCPlatformMacros.h" +#include "platform/CCPlatformMacros.h" NS_CC_BEGIN class PhysicsContact; diff --git a/cocos/physics/chipmunk/CCPhysicsHelper_chipmunk.h b/cocos/physics/chipmunk/CCPhysicsHelper_chipmunk.h index fde230ad1f..e6deb135a4 100644 --- a/cocos/physics/chipmunk/CCPhysicsHelper_chipmunk.h +++ b/cocos/physics/chipmunk/CCPhysicsHelper_chipmunk.h @@ -29,7 +29,7 @@ #if CC_USE_PHYSICS #include "chipmunk.h" -#include "base/CCPlatformMacros.h" +#include "platform/CCPlatformMacros.h" #include "math/CCGeometry.h" NS_CC_BEGIN diff --git a/cocos/physics/chipmunk/CCPhysicsJointInfo_chipmunk.h b/cocos/physics/chipmunk/CCPhysicsJointInfo_chipmunk.h index fca8f708ad..9e5eccf2bf 100644 --- a/cocos/physics/chipmunk/CCPhysicsJointInfo_chipmunk.h +++ b/cocos/physics/chipmunk/CCPhysicsJointInfo_chipmunk.h @@ -28,7 +28,7 @@ #include "base/ccConfig.h" #if CC_USE_PHYSICS -#include "base/CCPlatformMacros.h" +#include "platform/CCPlatformMacros.h" #include #include diff --git a/cocos/physics/chipmunk/CCPhysicsShapeInfo_chipmunk.h b/cocos/physics/chipmunk/CCPhysicsShapeInfo_chipmunk.h index f760ec15a6..4167211051 100644 --- a/cocos/physics/chipmunk/CCPhysicsShapeInfo_chipmunk.h +++ b/cocos/physics/chipmunk/CCPhysicsShapeInfo_chipmunk.h @@ -30,7 +30,7 @@ #include #include -#include "base/CCPlatformMacros.h" +#include "platform/CCPlatformMacros.h" typedef uintptr_t cpGroup; struct cpShape; diff --git a/cocos/physics/chipmunk/CCPhysicsWorldInfo_chipmunk.h b/cocos/physics/chipmunk/CCPhysicsWorldInfo_chipmunk.h index 2027dd23ac..15b8e08e33 100644 --- a/cocos/physics/chipmunk/CCPhysicsWorldInfo_chipmunk.h +++ b/cocos/physics/chipmunk/CCPhysicsWorldInfo_chipmunk.h @@ -29,7 +29,7 @@ #if CC_USE_PHYSICS #include -#include "base/CCPlatformMacros.h" +#include "platform/CCPlatformMacros.h" #include "math/CCGeometry.h" struct cpSpace; diff --git a/cocos/platform/CCApplication.h b/cocos/platform/CCApplication.h index 13049cb7c6..4581bdaaf8 100644 --- a/cocos/platform/CCApplication.h +++ b/cocos/platform/CCApplication.h @@ -26,7 +26,7 @@ THE SOFTWARE. #ifndef __PLATFORM_CCAPPLICATION_H__ #define __PLATFORM_CCAPPLICATION_H__ -#include "base/CCPlatformConfig.h" +#include "platform/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_MAC #include "platform/mac/CCApplication-mac.h" diff --git a/cocos/platform/CCApplicationProtocol.h b/cocos/platform/CCApplicationProtocol.h index 2e56e0524d..6d9697fdb6 100644 --- a/cocos/platform/CCApplicationProtocol.h +++ b/cocos/platform/CCApplicationProtocol.h @@ -26,7 +26,7 @@ THE SOFTWARE. #ifndef __CC_APPLICATION_PROTOCOL_H__ #define __CC_APPLICATION_PROTOCOL_H__ -#include "base/CCPlatformMacros.h" +#include "platform/CCPlatformMacros.h" #include "base/CCScriptSupport.h" #include "base/CCAutoreleasePool.h" diff --git a/cocos/platform/CCCommon.h b/cocos/platform/CCCommon.h index 91c932c9df..2b80353da9 100644 --- a/cocos/platform/CCCommon.h +++ b/cocos/platform/CCCommon.h @@ -26,7 +26,7 @@ THE SOFTWARE. #ifndef __CC_COMMON_H__ #define __CC_COMMON_H__ -#include "base/CCPlatformMacros.h" +#include "platform/CCPlatformMacros.h" NS_CC_BEGIN diff --git a/cocos/platform/CCDevice.h b/cocos/platform/CCDevice.h index 91e6485559..cda97b218a 100644 --- a/cocos/platform/CCDevice.h +++ b/cocos/platform/CCDevice.h @@ -26,7 +26,7 @@ THE SOFTWARE. #ifndef __CCDEVICE_H__ #define __CCDEVICE_H__ -#include "base/CCPlatformMacros.h" +#include "platform/CCPlatformMacros.h" #include "base/ccMacros.h" #include "base/CCData.h" diff --git a/cocos/platform/CCFileUtils.h b/cocos/platform/CCFileUtils.h index fc8ec3b69a..ee097a3c53 100644 --- a/cocos/platform/CCFileUtils.h +++ b/cocos/platform/CCFileUtils.h @@ -29,7 +29,7 @@ THE SOFTWARE. #include #include -#include "base/CCPlatformMacros.h" +#include "platform/CCPlatformMacros.h" #include "base/ccTypes.h" #include "base/CCValue.h" #include "base/CCData.h" diff --git a/cocos/platform/CCGL.h b/cocos/platform/CCGL.h index 348a0c5542..0b3a703e99 100644 --- a/cocos/platform/CCGL.h +++ b/cocos/platform/CCGL.h @@ -26,7 +26,7 @@ THE SOFTWARE. #ifndef __PLATFORM_CCGL_H__ #define __PLATFORM_CCGL_H__ -#include "base/CCPlatformConfig.h" +#include "platform/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_MAC #include "platform/mac/CCGL-mac.h" diff --git a/cocos/base/CCPlatformConfig.h b/cocos/platform/CCPlatformConfig.h similarity index 100% rename from cocos/base/CCPlatformConfig.h rename to cocos/platform/CCPlatformConfig.h diff --git a/cocos/platform/CCPlatformDefine.h b/cocos/platform/CCPlatformDefine.h index 28a5df3217..1f794101a9 100644 --- a/cocos/platform/CCPlatformDefine.h +++ b/cocos/platform/CCPlatformDefine.h @@ -26,7 +26,7 @@ THE SOFTWARE. #ifndef __PLATFORM_CCPLATFORMDEFINE_H__ #define __PLATFORM_CCPLATFORMDEFINE_H__ -#include "base/CCPlatformConfig.h" +#include "platform/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_MAC #include "platform/mac/CCPlatformDefine-mac.h" diff --git a/cocos/base/CCPlatformMacros.h b/cocos/platform/CCPlatformMacros.h similarity index 99% rename from cocos/base/CCPlatformMacros.h rename to cocos/platform/CCPlatformMacros.h index 0511fbfb01..455f7c0cf2 100644 --- a/cocos/base/CCPlatformMacros.h +++ b/cocos/platform/CCPlatformMacros.h @@ -29,7 +29,7 @@ Copyright (c) 2013-2014 Chukong Technologies * define some platform specific macros */ #include "base/ccConfig.h" -#include "base/CCPlatformConfig.h" +#include "platform/CCPlatformConfig.h" #include "platform/CCPlatformDefine.h" /** diff --git a/cocos/platform/CCSAXParser.h b/cocos/platform/CCSAXParser.h index 601e87d831..222affb538 100644 --- a/cocos/platform/CCSAXParser.h +++ b/cocos/platform/CCSAXParser.h @@ -24,7 +24,7 @@ #ifndef __CCSAXPARSER_H__ #define __CCSAXPARSER_H__ -#include "base/CCPlatformConfig.h" +#include "platform/CCPlatformConfig.h" #include "platform/CCCommon.h" #include diff --git a/cocos/platform/CCStdC.h b/cocos/platform/CCStdC.h index a7e258856b..9ea6eba3be 100644 --- a/cocos/platform/CCStdC.h +++ b/cocos/platform/CCStdC.h @@ -26,7 +26,7 @@ THE SOFTWARE. #ifndef __PLATFORM_CCSTDC_H__ #define __PLATFORM_CCSTDC_H__ -#include "base/CCPlatformConfig.h" +#include "platform/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_MAC #include "platform/mac/CCStdC-mac.h" diff --git a/cocos/platform/CCThread.h b/cocos/platform/CCThread.h index b9aa869af3..0598adcf97 100644 --- a/cocos/platform/CCThread.h +++ b/cocos/platform/CCThread.h @@ -26,7 +26,7 @@ THE SOFTWARE. #ifndef __CC_PLATFORM_THREAD_H__ #define __CC_PLATFORM_THREAD_H__ -#include "base/CCPlatformMacros.h" +#include "platform/CCPlatformMacros.h" NS_CC_BEGIN diff --git a/cocos/platform/apple/CCFileUtils-apple.h b/cocos/platform/apple/CCFileUtils-apple.h index 6245ef8bd9..41c24328cc 100644 --- a/cocos/platform/apple/CCFileUtils-apple.h +++ b/cocos/platform/apple/CCFileUtils-apple.h @@ -30,7 +30,7 @@ #include #include "platform/CCFileUtils.h" -#include "base/CCPlatformMacros.h" +#include "platform/CCPlatformMacros.h" #include "base/ccTypes.h" NS_CC_BEGIN diff --git a/cocos/platform/apple/CCLock-apple.h b/cocos/platform/apple/CCLock-apple.h index 94868a92c1..52b9000100 100644 --- a/cocos/platform/apple/CCLock-apple.h +++ b/cocos/platform/apple/CCLock-apple.h @@ -26,7 +26,7 @@ THE SOFTWARE. #ifndef __PLATFORM_IPHONE_PLATFORM_CCLOCK_H__ #define __PLATFORM_IPHONE_PLATFORM_CCLOCK_H__ -#include "base/CCPlatformMacros.h" +#include "platform/CCPlatformMacros.h" NS_CC_BEGIN diff --git a/cocos/platform/ios/CCApplication-ios.h b/cocos/platform/ios/CCApplication-ios.h index b41cabd53a..88c6a4f486 100644 --- a/cocos/platform/ios/CCApplication-ios.h +++ b/cocos/platform/ios/CCApplication-ios.h @@ -26,7 +26,7 @@ THE SOFTWARE. #ifndef __CC_APPLICATION_IOS_H__ #define __CC_APPLICATION_IOS_H__ -#include "base/CCPlatformConfig.h" +#include "platform/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS #include "platform/CCCommon.h" diff --git a/cocos/platform/ios/CCCommon-ios.mm b/cocos/platform/ios/CCCommon-ios.mm index c435c69a94..eb86946277 100644 --- a/cocos/platform/ios/CCCommon-ios.mm +++ b/cocos/platform/ios/CCCommon-ios.mm @@ -23,7 +23,7 @@ THE SOFTWARE. ****************************************************************************/ -#include "base/CCPlatformConfig.h" +#include "platform/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS #include "platform/CCCommon.h" diff --git a/cocos/platform/ios/CCDevice-ios.mm b/cocos/platform/ios/CCDevice-ios.mm index 28438ea897..ab91dc7843 100644 --- a/cocos/platform/ios/CCDevice-ios.mm +++ b/cocos/platform/ios/CCDevice-ios.mm @@ -24,7 +24,7 @@ ****************************************************************************/ -#include "base/CCPlatformConfig.h" +#include "platform/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS #include "CCDevice.h" diff --git a/cocos/platform/ios/CCDirectorCaller-ios.h b/cocos/platform/ios/CCDirectorCaller-ios.h index 7802453409..ef91022d00 100644 --- a/cocos/platform/ios/CCDirectorCaller-ios.h +++ b/cocos/platform/ios/CCDirectorCaller-ios.h @@ -23,7 +23,7 @@ THE SOFTWARE. ****************************************************************************/ -#include "base/CCPlatformConfig.h" +#include "platform/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS #import diff --git a/cocos/platform/ios/CCDirectorCaller-ios.mm b/cocos/platform/ios/CCDirectorCaller-ios.mm index 386d1f1ff4..04099bc2b5 100644 --- a/cocos/platform/ios/CCDirectorCaller-ios.mm +++ b/cocos/platform/ios/CCDirectorCaller-ios.mm @@ -23,7 +23,7 @@ THE SOFTWARE. ****************************************************************************/ -#include "base/CCPlatformConfig.h" +#include "platform/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS #import "CCDirectorCaller-ios.h" diff --git a/cocos/platform/ios/CCEAGLView-ios.h b/cocos/platform/ios/CCEAGLView-ios.h index ed5a690a98..d3a48f1cff 100644 --- a/cocos/platform/ios/CCEAGLView-ios.h +++ b/cocos/platform/ios/CCEAGLView-ios.h @@ -61,7 +61,7 @@ Copyright (C) 2008 Apple Inc. All Rights Reserved. */ -#include "base/CCPlatformConfig.h" +#include "platform/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS #import diff --git a/cocos/platform/ios/CCEAGLView-ios.mm b/cocos/platform/ios/CCEAGLView-ios.mm index 947e24838d..338b3907a2 100644 --- a/cocos/platform/ios/CCEAGLView-ios.mm +++ b/cocos/platform/ios/CCEAGLView-ios.mm @@ -61,7 +61,7 @@ Copyright (C) 2008 Apple Inc. All Rights Reserved. */ -#include "base/CCPlatformConfig.h" +#include "platform/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS #import "CCEAGLView-ios.h" diff --git a/cocos/platform/ios/CCES2Renderer-ios.h b/cocos/platform/ios/CCES2Renderer-ios.h index 66d9127af3..d581c5a746 100644 --- a/cocos/platform/ios/CCES2Renderer-ios.h +++ b/cocos/platform/ios/CCES2Renderer-ios.h @@ -28,7 +28,7 @@ // 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. -#include "base/CCPlatformConfig.h" +#include "platform/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS #import "CCESRenderer-ios.h" diff --git a/cocos/platform/ios/CCES2Renderer-ios.m b/cocos/platform/ios/CCES2Renderer-ios.m index c3c64cddb2..3327a5f159 100644 --- a/cocos/platform/ios/CCES2Renderer-ios.m +++ b/cocos/platform/ios/CCES2Renderer-ios.m @@ -28,12 +28,12 @@ // 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. -#include "base/CCPlatformConfig.h" +#include "platform/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS #import "CCES2Renderer-ios.h" -#import "base/CCPlatformMacros.h" +#import "platform/CCPlatformMacros.h" #import "OpenGL_Internal-ios.h" #if !defined(COCOS2D_DEBUG) || COCOS2D_DEBUG == 0 diff --git a/cocos/platform/ios/CCESRenderer-ios.h b/cocos/platform/ios/CCESRenderer-ios.h index 9a91a08d1a..af8c4542d0 100644 --- a/cocos/platform/ios/CCESRenderer-ios.h +++ b/cocos/platform/ios/CCESRenderer-ios.h @@ -28,10 +28,10 @@ // 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. -#include "base/CCPlatformConfig.h" +#include "platform/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS -#include "base/CCPlatformMacros.h" +#include "platform/CCPlatformMacros.h" #import #import diff --git a/cocos/platform/ios/CCGL-ios.h b/cocos/platform/ios/CCGL-ios.h index 5983070072..ea9734473e 100644 --- a/cocos/platform/ios/CCGL-ios.h +++ b/cocos/platform/ios/CCGL-ios.h @@ -26,7 +26,7 @@ THE SOFTWARE. #ifndef __PLATFORM_IOS_CCGL_H__ #define __PLATFORM_IOS_CCGL_H__ -#include "base/CCPlatformConfig.h" +#include "platform/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS #define glClearDepth glClearDepthf diff --git a/cocos/platform/ios/CCGLViewImpl-ios.h b/cocos/platform/ios/CCGLViewImpl-ios.h index 4370151600..8e0f3286bb 100644 --- a/cocos/platform/ios/CCGLViewImpl-ios.h +++ b/cocos/platform/ios/CCGLViewImpl-ios.h @@ -26,7 +26,7 @@ #ifndef __CC_EGLVIEWIMPL_IPHONE_H__ #define __CC_EGLVIEWIMPL_IPHONE_H__ -#include "base/CCPlatformConfig.h" +#include "platform/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS #include "base/CCRef.h" diff --git a/cocos/platform/ios/CCGLViewImpl-ios.mm b/cocos/platform/ios/CCGLViewImpl-ios.mm index b0bb0ed2c2..9eeaeddacf 100644 --- a/cocos/platform/ios/CCGLViewImpl-ios.mm +++ b/cocos/platform/ios/CCGLViewImpl-ios.mm @@ -23,7 +23,7 @@ THE SOFTWARE. ****************************************************************************/ -#include "base/CCPlatformConfig.h" +#include "platform/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS #import diff --git a/cocos/platform/ios/CCImage-ios.mm b/cocos/platform/ios/CCImage-ios.mm index ab288f8f65..d9a0dad034 100644 --- a/cocos/platform/ios/CCImage-ios.mm +++ b/cocos/platform/ios/CCImage-ios.mm @@ -23,7 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "base/CCPlatformConfig.h" +#include "platform/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS #import "platform/CCImage.h" diff --git a/cocos/platform/ios/CCPlatformDefine-ios.h b/cocos/platform/ios/CCPlatformDefine-ios.h index 275878fa1c..31f2979e65 100644 --- a/cocos/platform/ios/CCPlatformDefine-ios.h +++ b/cocos/platform/ios/CCPlatformDefine-ios.h @@ -25,7 +25,7 @@ THE SOFTWARE. #ifndef __CCPLATFORMDEFINE_H__ #define __CCPLATFORMDEFINE_H__ -#include "base/CCPlatformConfig.h" +#include "platform/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS #include diff --git a/cocos/platform/ios/CCStdC-ios.h b/cocos/platform/ios/CCStdC-ios.h index 6e8bcbd94f..ad3765ab0a 100644 --- a/cocos/platform/ios/CCStdC-ios.h +++ b/cocos/platform/ios/CCStdC-ios.h @@ -26,10 +26,10 @@ THE SOFTWARE. #ifndef __CC_STD_C_H__ #define __CC_STD_C_H__ -#include "base/CCPlatformConfig.h" +#include "platform/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS -#include "base/CCPlatformMacros.h" +#include "platform/CCPlatformMacros.h" #include #include #include diff --git a/cocos/platform/ios/OpenGL_Internal-ios.h b/cocos/platform/ios/OpenGL_Internal-ios.h index bf5758cd70..d9d9c2acc3 100644 --- a/cocos/platform/ios/OpenGL_Internal-ios.h +++ b/cocos/platform/ios/OpenGL_Internal-ios.h @@ -61,7 +61,7 @@ Copyright (C) 2008 Apple Inc. All Rights Reserved. */ -#include "base/CCPlatformConfig.h" +#include "platform/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS /* Generic error reporting */ diff --git a/cocos/platform/mac/CCApplication-mac.h b/cocos/platform/mac/CCApplication-mac.h index 0655b4120b..8ff4c7e166 100644 --- a/cocos/platform/mac/CCApplication-mac.h +++ b/cocos/platform/mac/CCApplication-mac.h @@ -26,7 +26,7 @@ THE SOFTWARE. #ifndef __CC_APPLICATION_MAC_H__ #define __CC_APPLICATION_MAC_H__ -#include "base/CCPlatformConfig.h" +#include "platform/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_MAC #include "platform/CCCommon.h" diff --git a/cocos/platform/mac/CCApplication-mac.mm b/cocos/platform/mac/CCApplication-mac.mm index bae4d94522..3f7f1d4f1c 100644 --- a/cocos/platform/mac/CCApplication-mac.mm +++ b/cocos/platform/mac/CCApplication-mac.mm @@ -23,7 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "base/CCPlatformConfig.h" +#include "platform/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_MAC #import "CCApplication.h" diff --git a/cocos/platform/mac/CCCommon-mac.mm b/cocos/platform/mac/CCCommon-mac.mm index 739628c873..e114eab0cd 100644 --- a/cocos/platform/mac/CCCommon-mac.mm +++ b/cocos/platform/mac/CCCommon-mac.mm @@ -23,7 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "base/CCPlatformConfig.h" +#include "platform/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_MAC #include "platform/CCCommon.h" diff --git a/cocos/platform/mac/CCDevice-mac.mm b/cocos/platform/mac/CCDevice-mac.mm index 87dbaeadb5..447a55d327 100644 --- a/cocos/platform/mac/CCDevice-mac.mm +++ b/cocos/platform/mac/CCDevice-mac.mm @@ -23,7 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "base/CCPlatformConfig.h" +#include "platform/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_MAC #include "platform/CCDevice.h" diff --git a/cocos/platform/mac/CCGL-mac.h b/cocos/platform/mac/CCGL-mac.h index ad1244726d..8e3a985a67 100644 --- a/cocos/platform/mac/CCGL-mac.h +++ b/cocos/platform/mac/CCGL-mac.h @@ -26,7 +26,7 @@ THE SOFTWARE. #ifndef __PLATFORM_MAC_CCGL_H__ #define __PLATFORM_MAC_CCGL_H__ -#include "base/CCPlatformConfig.h" +#include "platform/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_MAC #import diff --git a/cocos/platform/mac/CCPlatformDefine-mac.h b/cocos/platform/mac/CCPlatformDefine-mac.h index cc87086f88..fef5584edd 100644 --- a/cocos/platform/mac/CCPlatformDefine-mac.h +++ b/cocos/platform/mac/CCPlatformDefine-mac.h @@ -26,7 +26,7 @@ THE SOFTWARE. #ifndef __CCPLATFORMDEFINE_H__ #define __CCPLATFORMDEFINE_H__ -#include "base/CCPlatformConfig.h" +#include "platform/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_MAC #include diff --git a/cocos/platform/mac/CCStdC-mac.h b/cocos/platform/mac/CCStdC-mac.h index fdb0ace8b9..7da1a774fe 100644 --- a/cocos/platform/mac/CCStdC-mac.h +++ b/cocos/platform/mac/CCStdC-mac.h @@ -26,10 +26,10 @@ THE SOFTWARE. #ifndef __CC_STD_C_H__ #define __CC_STD_C_H__ -#include "base/CCPlatformConfig.h" +#include "platform/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_MAC -#include "base/CCPlatformMacros.h" +#include "platform/CCPlatformMacros.h" #include #include #include diff --git a/cocos/renderer/CCRenderCommand.h b/cocos/renderer/CCRenderCommand.h index 882cc3518e..7c560cda58 100644 --- a/cocos/renderer/CCRenderCommand.h +++ b/cocos/renderer/CCRenderCommand.h @@ -28,7 +28,7 @@ #include -#include "base/CCPlatformMacros.h" +#include "platform/CCPlatformMacros.h" #include "base/ccTypes.h" NS_CC_BEGIN diff --git a/cocos/renderer/CCRenderCommandPool.h b/cocos/renderer/CCRenderCommandPool.h index de4c5e0201..157ff8c2c3 100644 --- a/cocos/renderer/CCRenderCommandPool.h +++ b/cocos/renderer/CCRenderCommandPool.h @@ -28,7 +28,7 @@ #include -#include "base/CCPlatformMacros.h" +#include "platform/CCPlatformMacros.h" NS_CC_BEGIN diff --git a/cocos/renderer/CCRenderer.h b/cocos/renderer/CCRenderer.h index db7d74651c..9402fa15a7 100644 --- a/cocos/renderer/CCRenderer.h +++ b/cocos/renderer/CCRenderer.h @@ -29,7 +29,7 @@ #include #include -#include "base/CCPlatformMacros.h" +#include "platform/CCPlatformMacros.h" #include "renderer/CCRenderCommand.h" #include "renderer/CCGLProgram.h" #include "platform/CCGL.h" diff --git a/cocos/renderer/CCTexture2D.cpp b/cocos/renderer/CCTexture2D.cpp index b0e0d182e9..a7eb01b4b1 100644 --- a/cocos/renderer/CCTexture2D.cpp +++ b/cocos/renderer/CCTexture2D.cpp @@ -40,7 +40,7 @@ THE SOFTWARE. #include "base/ccConfig.h" #include "base/ccMacros.h" #include "base/CCConfiguration.h" -#include "base/CCPlatformMacros.h" +#include "platform/CCPlatformMacros.h" #include "base/CCDirector.h" #include "renderer/CCGLProgram.h" #include "renderer/ccGLStateCache.h" diff --git a/cocos/renderer/ccGLStateCache.h b/cocos/renderer/ccGLStateCache.h index bb77f763a9..07b25bfe3d 100644 --- a/cocos/renderer/ccGLStateCache.h +++ b/cocos/renderer/ccGLStateCache.h @@ -31,7 +31,7 @@ THE SOFTWARE. #include #include "platform/CCGL.h" -#include "base/CCPlatformMacros.h" +#include "platform/CCPlatformMacros.h" NS_CC_BEGIN diff --git a/cocos/renderer/ccShaders.h b/cocos/renderer/ccShaders.h index be82d4e12f..bca7199d22 100644 --- a/cocos/renderer/ccShaders.h +++ b/cocos/renderer/ccShaders.h @@ -27,7 +27,7 @@ THE SOFTWARE. #define __CCSHADER_H__ #include "platform/CCGL.h" -#include "base/CCPlatformMacros.h" +#include "platform/CCPlatformMacros.h" NS_CC_BEGIN diff --git a/cocos/storage/local-storage/LocalStorage-android.cpp b/cocos/storage/local-storage/LocalStorage-android.cpp index 352a80ef5d..93ea42ec15 100644 --- a/cocos/storage/local-storage/LocalStorage-android.cpp +++ b/cocos/storage/local-storage/LocalStorage-android.cpp @@ -29,7 +29,7 @@ */ #include "LocalStorage.h" -#include "base/CCPlatformMacros.h" +#include "platform/CCPlatformMacros.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) diff --git a/cocos/storage/local-storage/LocalStorage.cpp b/cocos/storage/local-storage/LocalStorage.cpp index f925b12d71..f91a134a7d 100644 --- a/cocos/storage/local-storage/LocalStorage.cpp +++ b/cocos/storage/local-storage/LocalStorage.cpp @@ -28,7 +28,7 @@ */ #include "LocalStorage.h" -#include "base/CCPlatformMacros.h" +#include "platform/CCPlatformMacros.h" #if (CC_TARGET_PLATFORM != CC_PLATFORM_ANDROID) diff --git a/cocos/ui/UIDeprecated.h b/cocos/ui/UIDeprecated.h index f5ec082110..508322d061 100644 --- a/cocos/ui/UIDeprecated.h +++ b/cocos/ui/UIDeprecated.h @@ -25,7 +25,7 @@ #ifndef cocos2d_libs_UIDeprecated_h #define cocos2d_libs_UIDeprecated_h -#include "base/CCPlatformMacros.h" +#include "platform/CCPlatformMacros.h" #include "ui/UIWidget.h" #include "ui/UILayout.h" #include "ui/UIListView.h" diff --git a/cocos/ui/UIEditBox/UIEditBoxImpl-android.h b/cocos/ui/UIEditBox/UIEditBoxImpl-android.h index 11a2a0b7e9..706a10d4d4 100644 --- a/cocos/ui/UIEditBox/UIEditBoxImpl-android.h +++ b/cocos/ui/UIEditBox/UIEditBoxImpl-android.h @@ -26,7 +26,7 @@ #ifndef __UIEDITBOXIMPLANDROID_H__ #define __UIEDITBOXIMPLANDROID_H__ -#include "base/CCPlatformConfig.h" +#include "platform/CCPlatformConfig.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) diff --git a/cocos/ui/UIEditBox/UIEditBoxImpl-ios.h b/cocos/ui/UIEditBox/UIEditBoxImpl-ios.h index 453166ff47..20a3636481 100644 --- a/cocos/ui/UIEditBox/UIEditBoxImpl-ios.h +++ b/cocos/ui/UIEditBox/UIEditBoxImpl-ios.h @@ -26,7 +26,7 @@ #ifndef __UIEditBoxIMPLIOS_H__ #define __UIEditBoxIMPLIOS_H__ -#include "base/CCPlatformConfig.h" +#include "platform/CCPlatformConfig.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) diff --git a/cocos/ui/UIEditBox/UIEditBoxImpl-mac.h b/cocos/ui/UIEditBox/UIEditBoxImpl-mac.h index 326187a689..d9b47a5f43 100644 --- a/cocos/ui/UIEditBox/UIEditBoxImpl-mac.h +++ b/cocos/ui/UIEditBox/UIEditBoxImpl-mac.h @@ -26,7 +26,7 @@ #ifndef __UIEditBoxIMPLMAC_H__ #define __UIEditBoxIMPLMAC_H__ -#include "base/CCPlatformConfig.h" +#include "platform/CCPlatformConfig.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_MAC) diff --git a/cocos/ui/UIEditBox/UIEditBoxImpl-win32.cpp b/cocos/ui/UIEditBox/UIEditBoxImpl-win32.cpp index 1ecc777ed4..819e1daddd 100644 --- a/cocos/ui/UIEditBox/UIEditBoxImpl-win32.cpp +++ b/cocos/ui/UIEditBox/UIEditBoxImpl-win32.cpp @@ -24,7 +24,7 @@ ****************************************************************************/ #include "UIEditBoxImpl-win32.h" -#include "base/CCPlatformConfig.h" +#include "platform/CCPlatformConfig.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) #include "UIEditBox.h" diff --git a/cocos/ui/UIEditBox/UIEditBoxImpl-win32.h b/cocos/ui/UIEditBox/UIEditBoxImpl-win32.h index 61ff89bd81..2d2e4e28f7 100644 --- a/cocos/ui/UIEditBox/UIEditBoxImpl-win32.h +++ b/cocos/ui/UIEditBox/UIEditBoxImpl-win32.h @@ -26,7 +26,7 @@ #ifndef __UIEditBoxIMPLWIN_H__ #define __UIEditBoxIMPLWIN_H__ -#include "base/CCPlatformConfig.h" +#include "platform/CCPlatformConfig.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) diff --git a/cocos/ui/UIEditBox/UIEditBoxImpl-wp8.cpp b/cocos/ui/UIEditBox/UIEditBoxImpl-wp8.cpp index 26f1154b93..efffa3d87e 100644 --- a/cocos/ui/UIEditBox/UIEditBoxImpl-wp8.cpp +++ b/cocos/ui/UIEditBox/UIEditBoxImpl-wp8.cpp @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "base/CCPlatformConfig.h" +#include "platform/CCPlatformConfig.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) #include "UIEditBoxImpl-wp8.h" diff --git a/cocos/ui/UIEditBox/UIEditBoxImpl-wp8.h b/cocos/ui/UIEditBox/UIEditBoxImpl-wp8.h index c4164d67a1..f819fe9f47 100644 --- a/cocos/ui/UIEditBox/UIEditBoxImpl-wp8.h +++ b/cocos/ui/UIEditBox/UIEditBoxImpl-wp8.h @@ -24,7 +24,7 @@ THE SOFTWARE. #ifndef __UIEditBoxIMPLWP8_H__ #define __UIEditBoxIMPLWP8_H__ -#include "base/CCPlatformConfig.h" +#include "platform/CCPlatformConfig.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) #include "UIEditBoxImpl.h" diff --git a/cocos/ui/UIHelper.h b/cocos/ui/UIHelper.h index fb6136e7c7..20e8ee3cf2 100644 --- a/cocos/ui/UIHelper.h +++ b/cocos/ui/UIHelper.h @@ -26,7 +26,7 @@ THE SOFTWARE. #define __UIHELPER_H__ #include -#include "base/CCPlatformMacros.h" +#include "platform/CCPlatformMacros.h" #include "ui/GUIExport.h" NS_CC_BEGIN diff --git a/cocos/ui/UIScale9Sprite.h b/cocos/ui/UIScale9Sprite.h index 6a0d8b7e4f..51c32aea2c 100644 --- a/cocos/ui/UIScale9Sprite.h +++ b/cocos/ui/UIScale9Sprite.h @@ -28,7 +28,7 @@ #include "2d/CCNode.h" #include "2d/CCSpriteFrame.h" #include "2d/CCSpriteBatchNode.h" -#include "base/CCPlatformMacros.h" +#include "platform/CCPlatformMacros.h" #include "ui/GUIExport.h" NS_CC_BEGIN diff --git a/cocos/ui/UIWebView.mm b/cocos/ui/UIWebView.mm index 1f8ef6ae80..d537d7f00c 100644 --- a/cocos/ui/UIWebView.mm +++ b/cocos/ui/UIWebView.mm @@ -22,7 +22,7 @@ THE SOFTWARE. ****************************************************************************/ -#include "base/CCPlatformConfig.h" +#include "platform/CCPlatformConfig.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) diff --git a/tests/cpp-tests/proj.android/project.properties b/tests/cpp-tests/proj.android/project.properties index 572f7c30de..e8b0265294 100644 --- a/tests/cpp-tests/proj.android/project.properties +++ b/tests/cpp-tests/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