Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Moved base/CCPlatform* -> platform/CCPlatform*

This commit is contained in:
Ricardo Quesada 2014-09-09 17:17:07 -07:00
parent 73450be715
commit 6f3ca63f00
104 changed files with 126 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
build/cocos2d_libs.xcodeproj/project.pbxproj
View File

@ -1328,8 +1328,6 @@
1AAF5850180E40B9000584C8 /* LocalStorage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AAF584C180E40B9000584C8 /* LocalStorage.cpp */; }; 1AAF5850180E40B9000584C8 /* LocalStorage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AAF584C180E40B9000584C8 /* LocalStorage.cpp */; };
1AAF5851180E40B9000584C8 /* LocalStorage.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF584D180E40B9000584C8 /* LocalStorage.h */; }; 1AAF5851180E40B9000584C8 /* LocalStorage.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF584D180E40B9000584C8 /* LocalStorage.h */; };
1AAF5852180E40B9000584C8 /* 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 */; }; 1ABA68AE1888D700007D1BB4 /* CCFontCharMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1ABA68AC1888D700007D1BB4 /* CCFontCharMap.cpp */; };
1ABA68AF1888D700007D1BB4 /* 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 */; }; 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 */; }; 50643BDA19BFAF4400EF68ED /* CCApplication.h in Headers */ = {isa = PBXBuildFile; fileRef = 50643BD719BFAF4400EF68ED /* CCApplication.h */; };
50643BDB19BFAF4400EF68ED /* CCStdC.h in Headers */ = {isa = PBXBuildFile; fileRef = 50643BD819BFAF4400EF68ED /* CCStdC.h */; }; 50643BDB19BFAF4400EF68ED /* CCStdC.h in Headers */ = {isa = PBXBuildFile; fileRef = 50643BD819BFAF4400EF68ED /* CCStdC.h */; };
50643BDC19BFAF4400EF68ED /* 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 */; }; 5091A7A319BFABA800AC8789 /* CCPlatformDefine.h in Headers */ = {isa = PBXBuildFile; fileRef = 5091A7A219BFABA800AC8789 /* CCPlatformDefine.h */; };
50ABBD381925AB0000A911A9 /* CCAffineTransform.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD1B1925AB0000A911A9 /* CCAffineTransform.cpp */; }; 50ABBD381925AB0000A911A9 /* CCAffineTransform.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD1B1925AB0000A911A9 /* CCAffineTransform.cpp */; };
50ABBD391925AB0000A911A9 /* 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 */; }; 50ABBE8C1925AB6F00A911A9 /* CCNS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDF71925AB6E00A911A9 /* CCNS.cpp */; };
50ABBE8D1925AB6F00A911A9 /* CCNS.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDF81925AB6E00A911A9 /* CCNS.h */; }; 50ABBE8D1925AB6F00A911A9 /* CCNS.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDF81925AB6E00A911A9 /* CCNS.h */; };
50ABBE8E1925AB6F00A911A9 /* 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 */; }; 50ABBE931925AB6F00A911A9 /* CCProfiling.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDFB1925AB6E00A911A9 /* CCProfiling.cpp */; };
50ABBE941925AB6F00A911A9 /* 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 */; }; 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 = "<group>"; }; 1AAF584B180E40B9000584C8 /* Android.mk */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Android.mk; sourceTree = "<group>"; };
1AAF584C180E40B9000584C8 /* LocalStorage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LocalStorage.cpp; sourceTree = "<group>"; }; 1AAF584C180E40B9000584C8 /* LocalStorage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LocalStorage.cpp; sourceTree = "<group>"; };
1AAF584D180E40B9000584C8 /* LocalStorage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LocalStorage.h; sourceTree = "<group>"; }; 1AAF584D180E40B9000584C8 /* LocalStorage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LocalStorage.h; sourceTree = "<group>"; };
1AAF584E180E40B9000584C8 /* LocalStorageAndroid.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LocalStorageAndroid.cpp; sourceTree = "<group>"; };
1ABA68AC1888D700007D1BB4 /* CCFontCharMap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCFontCharMap.cpp; sourceTree = "<group>"; }; 1ABA68AC1888D700007D1BB4 /* CCFontCharMap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCFontCharMap.cpp; sourceTree = "<group>"; };
1ABA68AD1888D700007D1BB4 /* CCFontCharMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCFontCharMap.h; sourceTree = "<group>"; }; 1ABA68AD1888D700007D1BB4 /* CCFontCharMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCFontCharMap.h; sourceTree = "<group>"; };
1AC026991914068200FA920D /* ConvertUTF.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ConvertUTF.h; sourceTree = "<group>"; }; 1AC026991914068200FA920D /* ConvertUTF.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ConvertUTF.h; sourceTree = "<group>"; };
@ -2664,6 +2663,9 @@
50643BD319BFAECF00EF68ED /* CCGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGL.h; sourceTree = "<group>"; }; 50643BD319BFAECF00EF68ED /* CCGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGL.h; sourceTree = "<group>"; };
50643BD719BFAF4400EF68ED /* CCApplication.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCApplication.h; sourceTree = "<group>"; }; 50643BD719BFAF4400EF68ED /* CCApplication.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCApplication.h; sourceTree = "<group>"; };
50643BD819BFAF4400EF68ED /* CCStdC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCStdC.h; sourceTree = "<group>"; }; 50643BD819BFAF4400EF68ED /* CCStdC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCStdC.h; sourceTree = "<group>"; };
50643BDD19BFCCA300EF68ED /* LocalStorage-android.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "LocalStorage-android.cpp"; sourceTree = "<group>"; };
50643BE019BFCF1800EF68ED /* CCPlatformConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCPlatformConfig.h; sourceTree = "<group>"; };
50643BE119BFCF1800EF68ED /* CCPlatformMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCPlatformMacros.h; sourceTree = "<group>"; };
5091A7A219BFABA800AC8789 /* CCPlatformDefine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCPlatformDefine.h; sourceTree = "<group>"; }; 5091A7A219BFABA800AC8789 /* CCPlatformDefine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCPlatformDefine.h; sourceTree = "<group>"; };
50ABBD1B1925AB0000A911A9 /* CCAffineTransform.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCAffineTransform.cpp; sourceTree = "<group>"; }; 50ABBD1B1925AB0000A911A9 /* CCAffineTransform.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCAffineTransform.cpp; sourceTree = "<group>"; };
50ABBD1C1925AB0000A911A9 /* CCAffineTransform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCAffineTransform.h; sourceTree = "<group>"; }; 50ABBD1C1925AB0000A911A9 /* CCAffineTransform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCAffineTransform.h; sourceTree = "<group>"; };
@ -2781,8 +2783,6 @@
50ABBDF61925AB6E00A911A9 /* CCMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCMap.h; path = ../base/CCMap.h; sourceTree = "<group>"; }; 50ABBDF61925AB6E00A911A9 /* CCMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCMap.h; path = ../base/CCMap.h; sourceTree = "<group>"; };
50ABBDF71925AB6E00A911A9 /* CCNS.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCNS.cpp; path = ../base/CCNS.cpp; sourceTree = "<group>"; }; 50ABBDF71925AB6E00A911A9 /* CCNS.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCNS.cpp; path = ../base/CCNS.cpp; sourceTree = "<group>"; };
50ABBDF81925AB6E00A911A9 /* CCNS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCNS.h; path = ../base/CCNS.h; sourceTree = "<group>"; }; 50ABBDF81925AB6E00A911A9 /* CCNS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCNS.h; path = ../base/CCNS.h; sourceTree = "<group>"; };
50ABBDF91925AB6E00A911A9 /* CCPlatformConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCPlatformConfig.h; path = ../base/CCPlatformConfig.h; sourceTree = "<group>"; };
50ABBDFA1925AB6E00A911A9 /* CCPlatformMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCPlatformMacros.h; path = ../base/CCPlatformMacros.h; sourceTree = "<group>"; };
50ABBDFB1925AB6E00A911A9 /* CCProfiling.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCProfiling.cpp; path = ../base/CCProfiling.cpp; sourceTree = "<group>"; }; 50ABBDFB1925AB6E00A911A9 /* CCProfiling.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCProfiling.cpp; path = ../base/CCProfiling.cpp; sourceTree = "<group>"; };
50ABBDFC1925AB6E00A911A9 /* CCProfiling.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCProfiling.h; path = ../base/CCProfiling.h; sourceTree = "<group>"; }; 50ABBDFC1925AB6E00A911A9 /* CCProfiling.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCProfiling.h; path = ../base/CCProfiling.h; sourceTree = "<group>"; };
50ABBDFD1925AB6E00A911A9 /* CCProtocols.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCProtocols.h; path = ../base/CCProtocols.h; sourceTree = "<group>"; }; 50ABBDFD1925AB6E00A911A9 /* CCProtocols.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCProtocols.h; path = ../base/CCProtocols.h; sourceTree = "<group>"; };
@ -3205,8 +3205,6 @@
50ABBDF61925AB6E00A911A9 /* CCMap.h */, 50ABBDF61925AB6E00A911A9 /* CCMap.h */,
50ABBDF71925AB6E00A911A9 /* CCNS.cpp */, 50ABBDF71925AB6E00A911A9 /* CCNS.cpp */,
50ABBDF81925AB6E00A911A9 /* CCNS.h */, 50ABBDF81925AB6E00A911A9 /* CCNS.h */,
50ABBDF91925AB6E00A911A9 /* CCPlatformConfig.h */,
50ABBDFA1925AB6E00A911A9 /* CCPlatformMacros.h */,
50ABBDFB1925AB6E00A911A9 /* CCProfiling.cpp */, 50ABBDFB1925AB6E00A911A9 /* CCProfiling.cpp */,
50ABBDFC1925AB6E00A911A9 /* CCProfiling.h */, 50ABBDFC1925AB6E00A911A9 /* CCProfiling.h */,
50ABBDFD1925AB6E00A911A9 /* CCProtocols.h */, 50ABBDFD1925AB6E00A911A9 /* CCProtocols.h */,
@ -3835,10 +3833,10 @@
1AAF584A180E40B9000584C8 /* local-storage */ = { 1AAF584A180E40B9000584C8 /* local-storage */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
50643BDD19BFCCA300EF68ED /* LocalStorage-android.cpp */,
1AAF584B180E40B9000584C8 /* Android.mk */, 1AAF584B180E40B9000584C8 /* Android.mk */,
1AAF584C180E40B9000584C8 /* LocalStorage.cpp */, 1AAF584C180E40B9000584C8 /* LocalStorage.cpp */,
1AAF584D180E40B9000584C8 /* LocalStorage.h */, 1AAF584D180E40B9000584C8 /* LocalStorage.h */,
1AAF584E180E40B9000584C8 /* LocalStorageAndroid.cpp */,
); );
path = "local-storage"; path = "local-storage";
sourceTree = "<group>"; sourceTree = "<group>";
@ -4741,6 +4739,8 @@
50ABBF2D1926664700A911A9 /* desktop */, 50ABBF2D1926664700A911A9 /* desktop */,
50ABBF4E1926664700A911A9 /* mac */, 50ABBF4E1926664700A911A9 /* mac */,
50ABBF1A1926664700A911A9 /* apple */, 50ABBF1A1926664700A911A9 /* apple */,
50643BE019BFCF1800EF68ED /* CCPlatformConfig.h */,
50643BE119BFCF1800EF68ED /* CCPlatformMacros.h */,
5091A7A219BFABA800AC8789 /* CCPlatformDefine.h */, 5091A7A219BFABA800AC8789 /* CCPlatformDefine.h */,
50643BD319BFAECF00EF68ED /* CCGL.h */, 50643BD319BFAECF00EF68ED /* CCGL.h */,
50643BD719BFAF4400EF68ED /* CCApplication.h */, 50643BD719BFAF4400EF68ED /* CCApplication.h */,
@ -5188,6 +5188,7 @@
1A570204180BCBD40088DEC7 /* CCClippingNode.h in Headers */, 1A570204180BCBD40088DEC7 /* CCClippingNode.h in Headers */,
15AE1A7B19AAD40300C27E9E /* b2PolygonContact.h in Headers */, 15AE1A7B19AAD40300C27E9E /* b2PolygonContact.h in Headers */,
15AE1A2919AAD3D500C27E9E /* b2Collision.h in Headers */, 15AE1A2919AAD3D500C27E9E /* b2Collision.h in Headers */,
50643BE419BFCF1800EF68ED /* CCPlatformMacros.h in Headers */,
15AE184219AAD2F700C27E9E /* CCSprite3D.h in Headers */, 15AE184219AAD2F700C27E9E /* CCSprite3D.h in Headers */,
15AE18A019AAD33D00C27E9E /* CCNodeLoaderLibrary.h in Headers */, 15AE18A019AAD33D00C27E9E /* CCNodeLoaderLibrary.h in Headers */,
1A01C6A618F58F7500EFE3A6 /* CCNotificationCenter.h in Headers */, 1A01C6A618F58F7500EFE3A6 /* CCNotificationCenter.h in Headers */,
@ -5229,6 +5230,7 @@
1A57022F180BCC1A0088DEC7 /* CCParticleSystemQuad.h in Headers */, 1A57022F180BCC1A0088DEC7 /* CCParticleSystemQuad.h in Headers */,
15AE188519AAD33D00C27E9E /* CCBSequence.h in Headers */, 15AE188519AAD33D00C27E9E /* CCBSequence.h in Headers */,
15AE1AE219AAD42500C27E9E /* cpDampedRotarySpring.h in Headers */, 15AE1AE219AAD42500C27E9E /* cpDampedRotarySpring.h in Headers */,
50643BE219BFCF1800EF68ED /* CCPlatformConfig.h in Headers */,
5034CA49191D591100CE6051 /* ccShader_Label_df.frag in Headers */, 5034CA49191D591100CE6051 /* ccShader_Label_df.frag in Headers */,
292DB14119B4574100A80320 /* UIEditBoxImpl.h in Headers */, 292DB14119B4574100A80320 /* UIEditBoxImpl.h in Headers */,
1A01C68C18F57BE800EFE3A6 /* CCDeprecated.h in Headers */, 1A01C68C18F57BE800EFE3A6 /* CCDeprecated.h in Headers */,
@ -5258,7 +5260,6 @@
1A570294180BCCAB0088DEC7 /* CCAnimation.h in Headers */, 1A570294180BCCAB0088DEC7 /* CCAnimation.h in Headers */,
50ABBD421925AB0000A911A9 /* CCMathBase.h in Headers */, 50ABBD421925AB0000A911A9 /* CCMathBase.h in Headers */,
1A570298180BCCAB0088DEC7 /* CCAnimationCache.h in Headers */, 1A570298180BCCAB0088DEC7 /* CCAnimationCache.h in Headers */,
50ABBE911925AB6F00A911A9 /* CCPlatformMacros.h in Headers */,
50ABC05D1926664800A911A9 /* CCApplication-mac.h in Headers */, 50ABC05D1926664800A911A9 /* CCApplication-mac.h in Headers */,
15AE190019AAD35000C27E9E /* CCComAudio.h in Headers */, 15AE190019AAD35000C27E9E /* CCComAudio.h in Headers */,
15AE190419AAD35000C27E9E /* CCComRender.h in Headers */, 15AE190419AAD35000C27E9E /* CCComRender.h in Headers */,
@ -5362,7 +5363,6 @@
3EA3EDBE1991CDFA00645534 /* CCCamera.h in Headers */, 3EA3EDBE1991CDFA00645534 /* CCCamera.h in Headers */,
15AE1B6619AADA9900C27E9E /* UIImageView.h in Headers */, 15AE1B6619AADA9900C27E9E /* UIImageView.h in Headers */,
15AE1BB419AADFEF00C27E9E /* HttpResponse.h in Headers */, 15AE1BB419AADFEF00C27E9E /* HttpResponse.h in Headers */,
50ABBE8F1925AB6F00A911A9 /* CCPlatformConfig.h in Headers */,
15AE1A8519AAD40300C27E9E /* b2Joint.h in Headers */, 15AE1A8519AAD40300C27E9E /* b2Joint.h in Headers */,
15AE1A8D19AAD40300C27E9E /* b2RevoluteJoint.h in Headers */, 15AE1A8D19AAD40300C27E9E /* b2RevoluteJoint.h in Headers */,
50ABBE291925AB6F00A911A9 /* CCAutoreleasePool.h in Headers */, 50ABBE291925AB6F00A911A9 /* CCAutoreleasePool.h in Headers */,
@ -5543,6 +5543,7 @@
50ABBEC21925AB6F00A911A9 /* CCValue.h in Headers */, 50ABBEC21925AB6F00A911A9 /* CCValue.h in Headers */,
50ABBECA1925AB6F00A911A9 /* firePngData.h in Headers */, 50ABBECA1925AB6F00A911A9 /* firePngData.h in Headers */,
B257B4511989D5E800D9A687 /* CCPrimitive.h in Headers */, B257B4511989D5E800D9A687 /* CCPrimitive.h in Headers */,
50643BE319BFCF1800EF68ED /* CCPlatformConfig.h in Headers */,
15AE181F19AAD2F700C27E9E /* CCBundle3DData.h in Headers */, 15AE181F19AAD2F700C27E9E /* CCBundle3DData.h in Headers */,
15AE1B0D19AAD42500C27E9E /* cpVect.h in Headers */, 15AE1B0D19AAD42500C27E9E /* cpVect.h in Headers */,
15AE193119AAD35100C27E9E /* CCActionManagerEx.h in Headers */, 15AE193119AAD35100C27E9E /* CCActionManagerEx.h in Headers */,
@ -5696,7 +5697,7 @@
15AE1B8E19AADA9A00C27E9E /* UIDeprecated.h in Headers */, 15AE1B8E19AADA9A00C27E9E /* UIDeprecated.h in Headers */,
15AE1A3919AAD3D500C27E9E /* Box2D.h in Headers */, 15AE1A3919AAD3D500C27E9E /* Box2D.h in Headers */,
50ABBECE1925AB6F00A911A9 /* s3tc.h in Headers */, 50ABBECE1925AB6F00A911A9 /* s3tc.h in Headers */,
50ABBE901925AB6F00A911A9 /* CCPlatformConfig.h in Headers */, 50643BE519BFCF1800EF68ED /* CCPlatformMacros.h in Headers */,
15AE1BFA19AAE01E00C27E9E /* CCControlSwitch.h in Headers */, 15AE1BFA19AAE01E00C27E9E /* CCControlSwitch.h in Headers */,
15AE182F19AAD2F700C27E9E /* CCMeshVertexIndexData.h in Headers */, 15AE182F19AAD2F700C27E9E /* CCMeshVertexIndexData.h in Headers */,
15AE19F419AAD3A700C27E9E /* EventData.h in Headers */, 15AE19F419AAD3A700C27E9E /* EventData.h in Headers */,
@ -5919,7 +5920,6 @@
15AE1AA419AAD40300C27E9E /* b2ContactManager.h in Headers */, 15AE1AA419AAD40300C27E9E /* b2ContactManager.h in Headers */,
B276EF601988D1D500CD400F /* CCVertexIndexData.h in Headers */, B276EF601988D1D500CD400F /* CCVertexIndexData.h in Headers */,
50ABBD5F1925AB0000A911A9 /* Vec3.h in Headers */, 50ABBD5F1925AB0000A911A9 /* Vec3.h in Headers */,
50ABBE921925AB6F00A911A9 /* CCPlatformMacros.h in Headers */,
50ABBE821925AB6F00A911A9 /* CCEventType.h in Headers */, 50ABBE821925AB6F00A911A9 /* CCEventType.h in Headers */,
15AE194C19AAD35100C27E9E /* CCComRender.h in Headers */, 15AE194C19AAD35100C27E9E /* CCComRender.h in Headers */,
1AAF5852180E40B9000584C8 /* LocalStorage.h in Headers */, 1AAF5852180E40B9000584C8 /* LocalStorage.h in Headers */,
@ -6130,6 +6130,7 @@
1A570061180BC5A10088DEC7 /* CCAction.cpp in Sources */, 1A570061180BC5A10088DEC7 /* CCAction.cpp in Sources */,
15AE1BDC19AAE01E00C27E9E /* CCControlUtils.cpp in Sources */, 15AE1BDC19AAE01E00C27E9E /* CCControlUtils.cpp in Sources */,
50ABBEC51925AB6F00A911A9 /* etc1.cpp in Sources */, 50ABBEC51925AB6F00A911A9 /* etc1.cpp in Sources */,
50643BDE19BFCCA400EF68ED /* LocalStorage-android.cpp in Sources */,
15AE1B5B19AADA9900C27E9E /* UITextAtlas.cpp in Sources */, 15AE1B5B19AADA9900C27E9E /* UITextAtlas.cpp in Sources */,
1A570065180BC5A10088DEC7 /* CCActionCamera.cpp in Sources */, 1A570065180BC5A10088DEC7 /* CCActionCamera.cpp in Sources */,
50ABBEAB1925AB6F00A911A9 /* ccTypes.cpp in Sources */, 50ABBEAB1925AB6F00A911A9 /* ccTypes.cpp in Sources */,
@ -6424,7 +6425,6 @@
15AE1B1D19AAD43700C27E9E /* cpBBTree.c in Sources */, 15AE1B1D19AAD43700C27E9E /* cpBBTree.c in Sources */,
15AE1A2A19AAD3D500C27E9E /* b2Distance.cpp in Sources */, 15AE1A2A19AAD3D500C27E9E /* b2Distance.cpp in Sources */,
50ABBE6D1925AB6F00A911A9 /* CCEventListenerKeyboard.cpp in Sources */, 50ABBE6D1925AB6F00A911A9 /* CCEventListenerKeyboard.cpp in Sources */,
1AAF5853180E40B9000584C8 /* LocalStorageAndroid.cpp in Sources */,
15AE1B1B19AAD43700C27E9E /* cpArray.c in Sources */, 15AE1B1B19AAD43700C27E9E /* cpArray.c in Sources */,
15AE190B19AAD35000C27E9E /* CCDisplayFactory.cpp in Sources */, 15AE190B19AAD35000C27E9E /* CCDisplayFactory.cpp in Sources */,
1A9DCA27180E6955007A3AD4 /* CCGLBufferedNode.cpp in Sources */, 1A9DCA27180E6955007A3AD4 /* CCGLBufferedNode.cpp in Sources */,
@ -6650,6 +6650,7 @@
15AE18AF19AAD33D00C27E9E /* CCBKeyframe.cpp in Sources */, 15AE18AF19AAD33D00C27E9E /* CCBKeyframe.cpp in Sources */,
15AE19FB19AAD3A700C27E9E /* AnimationStateData.cpp in Sources */, 15AE19FB19AAD3A700C27E9E /* AnimationStateData.cpp in Sources */,
15AE1A0119AAD3A700C27E9E /* Attachment.cpp in Sources */, 15AE1A0119AAD3A700C27E9E /* Attachment.cpp in Sources */,
50643BDF19BFCCA400EF68ED /* LocalStorage-android.cpp in Sources */,
15AE1B4819AAD43700C27E9E /* cpVect.c in Sources */, 15AE1B4819AAD43700C27E9E /* cpVect.c in Sources */,
15AE1B3E19AAD43700C27E9E /* cpHashSet.c in Sources */, 15AE1B3E19AAD43700C27E9E /* cpHashSet.c in Sources */,
50ABBED81925AB6F00A911A9 /* ZipUtils.cpp in Sources */, 50ABBED81925AB6F00A911A9 /* ZipUtils.cpp in Sources */,
@ -6898,7 +6899,6 @@
15AE192E19AAD35100C27E9E /* CCActionFrameEasing.cpp in Sources */, 15AE192E19AAD35100C27E9E /* CCActionFrameEasing.cpp in Sources */,
15AE195519AAD35100C27E9E /* CCDisplayManager.cpp in Sources */, 15AE195519AAD35100C27E9E /* CCDisplayManager.cpp in Sources */,
15AE1BA719AADFDF00C27E9E /* UIRelativeBox.cpp in Sources */, 15AE1BA719AADFDF00C27E9E /* UIRelativeBox.cpp in Sources */,
1AAF5854180E40B9000584C8 /* LocalStorageAndroid.cpp in Sources */,
15AE1ACE19AAD40300C27E9E /* b2PulleyJoint.cpp in Sources */, 15AE1ACE19AAD40300C27E9E /* b2PulleyJoint.cpp in Sources */,
1A9DCA28180E6955007A3AD4 /* CCGLBufferedNode.cpp in Sources */, 1A9DCA28180E6955007A3AD4 /* CCGLBufferedNode.cpp in Sources */,
15AE1B4719AAD43700C27E9E /* cpSweep1D.c in Sources */, 15AE1B4719AAD43700C27E9E /* cpSweep1D.c in Sources */,

2
cocos/2d/CCAnimation.h
View File

@ -27,7 +27,7 @@ THE SOFTWARE.
#ifndef __CC_ANIMATION_H__ #ifndef __CC_ANIMATION_H__
#define __CC_ANIMATION_H__ #define __CC_ANIMATION_H__
#include "base/CCPlatformConfig.h" #include "platform/CCPlatformConfig.h"
#include "base/CCRef.h" #include "base/CCRef.h"
#include "base/CCValue.h" #include "base/CCValue.h"
#include "base/CCVector.h" #include "base/CCVector.h"

2
cocos/2d/CCFontAtlas.h
View File

@ -28,7 +28,7 @@
#include <string> #include <string>
#include <unordered_map> #include <unordered_map>
#include "base/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
#include "base/CCRef.h" #include "base/CCRef.h"
#include "platform/CCStdC.h" // ssize_t on windows #include "platform/CCStdC.h" // ssize_t on windows

2
cocos/2d/CCLabelTextFormatter.h
View File

@ -26,7 +26,7 @@
#ifndef _CCLabelTextFormatter_h_ #ifndef _CCLabelTextFormatter_h_
#define _CCLabelTextFormatter_h_ #define _CCLabelTextFormatter_h_
#include "base/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
NS_CC_BEGIN NS_CC_BEGIN

2
cocos/2d/CCTweenFunction.h
View File

@ -25,7 +25,7 @@ THE SOFTWARE.
#ifndef __CCTWEENFUNCTION_H__ #ifndef __CCTWEENFUNCTION_H__
#define __CCTWEENFUNCTION_H__ #define __CCTWEENFUNCTION_H__
#include "base/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
NS_CC_BEGIN NS_CC_BEGIN

2
cocos/3d/CCAnimationCurve.h
View File

@ -26,7 +26,7 @@
#include <functional> #include <functional>
#include "base/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
#include "base/CCRef.h" #include "base/CCRef.h"
#include "math/CCMath.h" #include "math/CCMath.h"

2
cocos/3d/CCBundleReader.h
View File

@ -29,7 +29,7 @@
#include <vector> #include <vector>
#include "base/CCRef.h" #include "base/CCRef.h"
#include "base/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
#include "base/CCConsole.h" #include "base/CCConsole.h"
NS_CC_BEGIN NS_CC_BEGIN

2
cocos/3d/CCSprite3D.cpp
View File

@ -31,7 +31,7 @@
#include "3d/CCMesh.h" #include "3d/CCMesh.h"
#include "base/CCDirector.h" #include "base/CCDirector.h"
#include "base/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
#include "base/ccMacros.h" #include "base/ccMacros.h"
#include "platform/CCFileUtils.h" #include "platform/CCFileUtils.h"
#include "renderer/CCTextureCache.h" #include "renderer/CCTextureCache.h"

2
cocos/base/CCConsole.cpp
View File

@ -56,7 +56,7 @@
#include "base/CCDirector.h" #include "base/CCDirector.h"
#include "base/CCScheduler.h" #include "base/CCScheduler.h"
#include "base/CCPlatformConfig.h" #include "platform/CCPlatformConfig.h"
#include "base/CCConfiguration.h" #include "base/CCConfiguration.h"
#include "2d/CCScene.h" #include "2d/CCScene.h"
#include "platform/CCFileUtils.h" #include "platform/CCFileUtils.h"

2
cocos/base/CCConsole.h
View File

@ -49,7 +49,7 @@ typedef SSIZE_T ssize_t;
#include "base/CCRef.h" #include "base/CCRef.h"
#include "base/ccMacros.h" #include "base/ccMacros.h"
#include "base/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
NS_CC_BEGIN NS_CC_BEGIN

2
cocos/base/CCController-iOS.mm
View File

@ -24,7 +24,7 @@
****************************************************************************/ ****************************************************************************/
#include "CCController.h" #include "CCController.h"
#include "base/CCPlatformConfig.h" #include "platform/CCPlatformConfig.h"
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) #if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS)
#include "ccMacros.h" #include "ccMacros.h"

2
cocos/base/CCData.h
View File

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

2
cocos/base/CCDataVisitor.h
View File

@ -25,7 +25,7 @@
#ifndef __CCDATAVISITOR_H__ #ifndef __CCDATAVISITOR_H__
#define __CCDATAVISITOR_H__ #define __CCDATAVISITOR_H__
#include "base/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
#include <string> #include <string>
NS_CC_BEGIN NS_CC_BEGIN

2
cocos/base/CCDirector.h
View File

@ -30,7 +30,7 @@ THE SOFTWARE.
#include <stack> #include <stack>
#include "base/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
#include "base/CCRef.h" #include "base/CCRef.h"
#include "base/CCVector.h" #include "base/CCVector.h"
#include "2d/CCScene.h" #include "2d/CCScene.h"

2
cocos/base/CCEvent.h
View File

@ -27,7 +27,7 @@
#define __CCEVENT_H__ #define __CCEVENT_H__
#include "base/CCRef.h" #include "base/CCRef.h"
#include "base/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
NS_CC_BEGIN NS_CC_BEGIN

2
cocos/base/CCEventController.h
View File

@ -26,7 +26,7 @@
#ifndef __cocos2d_libs__EventController__ #ifndef __cocos2d_libs__EventController__
#define __cocos2d_libs__EventController__ #define __cocos2d_libs__EventController__
#include "base/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
#include "base/CCEvent.h" #include "base/CCEvent.h"
NS_CC_BEGIN NS_CC_BEGIN

2
cocos/base/CCEventDispatcher.h
View File

@ -31,7 +31,7 @@
#include <vector> #include <vector>
#include <set> #include <set>
#include "base/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
#include "base/CCEventListener.h" #include "base/CCEventListener.h"
#include "base/CCEvent.h" #include "base/CCEvent.h"
#include "platform/CCStdC.h" #include "platform/CCStdC.h"

2
cocos/base/CCEventListener.h
View File

@ -29,7 +29,7 @@
#include <string> #include <string>
#include <memory> #include <memory>
#include "base/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
#include "base/CCRef.h" #include "base/CCRef.h"
NS_CC_BEGIN NS_CC_BEGIN

2
cocos/base/CCEventListenerController.h
View File

@ -26,7 +26,7 @@
#ifndef __cocos2d_libs__EventListenerController__ #ifndef __cocos2d_libs__EventListenerController__
#define __cocos2d_libs__EventListenerController__ #define __cocos2d_libs__EventListenerController__
#include "base/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
#include "base/CCEventListener.h" #include "base/CCEventListener.h"
NS_CC_BEGIN NS_CC_BEGIN

2
cocos/base/CCRef.h
View File

@ -26,7 +26,7 @@ THE SOFTWARE.
#ifndef __BASE_CCREF_H__ #ifndef __BASE_CCREF_H__
#define __BASE_CCREF_H__ #define __BASE_CCREF_H__
#include "base/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
#include "base/ccConfig.h" #include "base/ccConfig.h"
#define CC_USE_MEM_LEAK_DETECTION 0 #define CC_USE_MEM_LEAK_DETECTION 0

2
cocos/base/CCUserDefault-android.cpp
View File

@ -23,7 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "base/CCUserDefault.h" #include "base/CCUserDefault.h"
#include "base/CCPlatformConfig.h" #include "platform/CCPlatformConfig.h"
#include "base/ccUtils.h" #include "base/ccUtils.h"
#include "platform/CCCommon.h" #include "platform/CCCommon.h"
#include "base/base64.h" #include "base/base64.h"

2
cocos/base/CCUserDefault-apple.mm
View File

@ -23,7 +23,7 @@
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "base/CCPlatformConfig.h" #include "platform/CCPlatformConfig.h"
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_MAC) #if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>

2
cocos/base/CCUserDefault.h
View File

@ -25,7 +25,7 @@ THE SOFTWARE.
#ifndef __SUPPORT_CCUSERDEFAULT_H__ #ifndef __SUPPORT_CCUSERDEFAULT_H__
#define __SUPPORT_CCUSERDEFAULT_H__ #define __SUPPORT_CCUSERDEFAULT_H__
#include "base/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
#include <string> #include <string>
#include "base/CCData.h" #include "base/CCData.h"

2
cocos/base/CCValue.h
View File

@ -25,7 +25,7 @@
#ifndef __cocos2d_libs__CCValue__ #ifndef __cocos2d_libs__CCValue__
#define __cocos2d_libs__CCValue__ #define __cocos2d_libs__CCValue__
#include "base/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
#include "base/ccMacros.h" #include "base/ccMacros.h"
#include <string> #include <string>
#include <vector> #include <vector>

2
cocos/base/ObjectFactory.h
View File

@ -29,7 +29,7 @@ THE SOFTWARE.
#include <unordered_map> #include <unordered_map>
#include <functional> #include <functional>
#include "base/CCRef.h" #include "base/CCRef.h"
#include "base/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
NS_CC_BEGIN NS_CC_BEGIN

4
cocos/base/ZipUtils.h
View File

@ -26,8 +26,8 @@ THE SOFTWARE.
#define __SUPPORT_ZIPUTILS_H__ #define __SUPPORT_ZIPUTILS_H__
#include <string> #include <string>
#include "base/CCPlatformConfig.h" #include "platform/CCPlatformConfig.h"
#include "base/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
#include "platform/CCPlatformDefine.h" #include "platform/CCPlatformDefine.h"
#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)

2
cocos/base/base64.h
View File

@ -26,7 +26,7 @@ THE SOFTWARE.
#ifndef __SUPPORT_BASE64_H__ #ifndef __SUPPORT_BASE64_H__
#define __SUPPORT_BASE64_H__ #define __SUPPORT_BASE64_H__
#include "base/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

2
cocos/base/ccConfig.h
View File

@ -28,7 +28,7 @@ THE SOFTWARE.
#ifndef __CCCONFIG_H__ #ifndef __CCCONFIG_H__
#define __CCCONFIG_H__ #define __CCCONFIG_H__
#include "base/CCPlatformConfig.h" #include "platform/CCPlatformConfig.h"
/** /**
@file @file

2
cocos/base/ccRandom.h
View File

@ -26,7 +26,7 @@ THE SOFTWARE.
#ifndef __ccRandom_H_ #ifndef __ccRandom_H_
#define __ccRandom_H_ #define __ccRandom_H_
#include "base/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
#include <random> #include <random>

2
cocos/base/ccUTF8.h
View File

@ -26,7 +26,7 @@
#ifndef __cocos2dx__ccUTF8__ #ifndef __cocos2dx__ccUTF8__
#define __cocos2dx__ccUTF8__ #define __cocos2dx__ccUTF8__
#include "base/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
#include <vector> #include <vector>
#include <string> #include <string>

2
cocos/cocos2d.cpp
View File

@ -25,7 +25,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "base/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
NS_CC_BEGIN NS_CC_BEGIN

4
cocos/cocos2d.h
View File

@ -175,8 +175,8 @@ THE SOFTWARE.
#include "platform/CCImage.h" #include "platform/CCImage.h"
#include "platform/CCSAXParser.h" #include "platform/CCSAXParser.h"
#include "platform/CCThread.h" #include "platform/CCThread.h"
#include "base/CCPlatformConfig.h" #include "platform/CCPlatformConfig.h"
#include "base/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) #if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS)
#include "platform/ios/CCApplication-ios.h" #include "platform/ios/CCApplication-ios.h"

2
cocos/editor-support/cocostudio/CCInputDelegate.h
View File

@ -25,7 +25,7 @@ THE SOFTWARE.
#ifndef __CC_EXTENTIONS_CCINPUTDELEGATE_H__ #ifndef __CC_EXTENTIONS_CCINPUTDELEGATE_H__
#define __CC_EXTENTIONS_CCINPUTDELEGATE_H__ #define __CC_EXTENTIONS_CCINPUTDELEGATE_H__
#include "base/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
#include "base/CCTouch.h" #include "base/CCTouch.h"
#include "base/CCEvent.h" #include "base/CCEvent.h"
#include "base/ccTypes.h" #include "base/ccTypes.h"

2
cocos/editor-support/cocostudio/CCSpriteFrameCacheHelper.h
View File

@ -24,7 +24,7 @@ THE SOFTWARE.
#ifndef __CCSPRITEFRAMECACHEHELPER_H__ #ifndef __CCSPRITEFRAMECACHEHELPER_H__
#define __CCSPRITEFRAMECACHEHELPER_H__ #define __CCSPRITEFRAMECACHEHELPER_H__
#include "base/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
#include "cocostudio/CCArmatureDefine.h" #include "cocostudio/CCArmatureDefine.h"
#include "cocostudio/CocosStudioExport.h" #include "cocostudio/CocosStudioExport.h"
#include <string> #include <string>

2
cocos/editor-support/cocostudio/DictionaryHelper.cpp
View File

@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "base/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
#include "cocostudio/DictionaryHelper.h" #include "cocostudio/DictionaryHelper.h"
namespace cocostudio { namespace cocostudio {

2
cocos/math/CCAffineTransform.h
View File

@ -26,7 +26,7 @@ THE SOFTWARE.
#ifndef __MATH_CCAFFINETRANSFORM_H__ #ifndef __MATH_CCAFFINETRANSFORM_H__
#define __MATH_CCAFFINETRANSFORM_H__ #define __MATH_CCAFFINETRANSFORM_H__
#include "base/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
#include "math/CCGeometry.h" #include "math/CCGeometry.h"
#include "math/CCMath.h" #include "math/CCMath.h"

2
cocos/math/CCGeometry.h
View File

@ -28,7 +28,7 @@ THE SOFTWARE.
#include <math.h> #include <math.h>
#include "base/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
#include "base/ccMacros.h" #include "base/ccMacros.h"
#include "math/CCMath.h" #include "math/CCMath.h"

2
cocos/math/CCMathBase.h
View File

@ -3,7 +3,7 @@
#include <memory> #include <memory>
#include <string.h> #include <string.h>
#include "base/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
#define MATH_DEG_TO_RAD(x) ((x) * 0.0174532925f) #define MATH_DEG_TO_RAD(x) ((x) * 0.0174532925f)
#define MATH_RAD_TO_DEG(x) ((x)* 57.29577951f) #define MATH_RAD_TO_DEG(x) ((x)* 57.29577951f)

2
cocos/network/SocketIO.h
View File

@ -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__ #ifndef __CC_SOCKETIO_H__
#define __CC_SOCKETIO_H__ #define __CC_SOCKETIO_H__
#include "base/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
#include "base/CCMap.h" #include "base/CCMap.h"
#include <string> #include <string>

2
cocos/network/WebSocket.h
View File

@ -33,7 +33,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include "base/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
#include "platform/CCStdC.h" #include "platform/CCStdC.h"
struct libwebsocket; struct libwebsocket;

2
cocos/physics/chipmunk/CCPhysicsBodyInfo_chipmunk.h
View File

@ -28,7 +28,7 @@
#include "base/ccConfig.h" #include "base/ccConfig.h"
#if CC_USE_PHYSICS #if CC_USE_PHYSICS
#include "base/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
#include "base/CCRef.h" #include "base/CCRef.h"
struct cpBody; struct cpBody;

2
cocos/physics/chipmunk/CCPhysicsContactInfo_chipmunk.h
View File

@ -28,7 +28,7 @@
#include "base/ccConfig.h" #include "base/ccConfig.h"
#if CC_USE_PHYSICS #if CC_USE_PHYSICS
#include "base/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
NS_CC_BEGIN NS_CC_BEGIN
class PhysicsContact; class PhysicsContact;

2
cocos/physics/chipmunk/CCPhysicsHelper_chipmunk.h
View File

@ -29,7 +29,7 @@
#if CC_USE_PHYSICS #if CC_USE_PHYSICS
#include "chipmunk.h" #include "chipmunk.h"
#include "base/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
#include "math/CCGeometry.h" #include "math/CCGeometry.h"
NS_CC_BEGIN NS_CC_BEGIN

2
cocos/physics/chipmunk/CCPhysicsJointInfo_chipmunk.h
View File

@ -28,7 +28,7 @@
#include "base/ccConfig.h" #include "base/ccConfig.h"
#if CC_USE_PHYSICS #if CC_USE_PHYSICS
#include "base/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
#include <vector> #include <vector>
#include <unordered_map> #include <unordered_map>

2
cocos/physics/chipmunk/CCPhysicsShapeInfo_chipmunk.h
View File

@ -30,7 +30,7 @@
#include <vector> #include <vector>
#include <unordered_map> #include <unordered_map>
#include "base/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
typedef uintptr_t cpGroup; typedef uintptr_t cpGroup;
struct cpShape; struct cpShape;

2
cocos/physics/chipmunk/CCPhysicsWorldInfo_chipmunk.h
View File

@ -29,7 +29,7 @@
#if CC_USE_PHYSICS #if CC_USE_PHYSICS
#include <vector> #include <vector>
#include "base/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
#include "math/CCGeometry.h" #include "math/CCGeometry.h"
struct cpSpace; struct cpSpace;

2
cocos/platform/CCApplication.h
View File

@ -26,7 +26,7 @@ THE SOFTWARE.
#ifndef __PLATFORM_CCAPPLICATION_H__ #ifndef __PLATFORM_CCAPPLICATION_H__
#define __PLATFORM_CCAPPLICATION_H__ #define __PLATFORM_CCAPPLICATION_H__
#include "base/CCPlatformConfig.h" #include "platform/CCPlatformConfig.h"
#if CC_TARGET_PLATFORM == CC_PLATFORM_MAC #if CC_TARGET_PLATFORM == CC_PLATFORM_MAC
#include "platform/mac/CCApplication-mac.h" #include "platform/mac/CCApplication-mac.h"

2
cocos/platform/CCApplicationProtocol.h
View File

@ -26,7 +26,7 @@ THE SOFTWARE.
#ifndef __CC_APPLICATION_PROTOCOL_H__ #ifndef __CC_APPLICATION_PROTOCOL_H__
#define __CC_APPLICATION_PROTOCOL_H__ #define __CC_APPLICATION_PROTOCOL_H__
#include "base/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
#include "base/CCScriptSupport.h" #include "base/CCScriptSupport.h"
#include "base/CCAutoreleasePool.h" #include "base/CCAutoreleasePool.h"

2
cocos/platform/CCCommon.h
View File

@ -26,7 +26,7 @@ THE SOFTWARE.
#ifndef __CC_COMMON_H__ #ifndef __CC_COMMON_H__
#define __CC_COMMON_H__ #define __CC_COMMON_H__
#include "base/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
NS_CC_BEGIN NS_CC_BEGIN

2
cocos/platform/CCDevice.h
View File

@ -26,7 +26,7 @@ THE SOFTWARE.
#ifndef __CCDEVICE_H__ #ifndef __CCDEVICE_H__
#define __CCDEVICE_H__ #define __CCDEVICE_H__
#include "base/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
#include "base/ccMacros.h" #include "base/ccMacros.h"
#include "base/CCData.h" #include "base/CCData.h"

2
cocos/platform/CCFileUtils.h
View File

@ -29,7 +29,7 @@ THE SOFTWARE.
#include <vector> #include <vector>
#include <unordered_map> #include <unordered_map>
#include "base/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
#include "base/ccTypes.h" #include "base/ccTypes.h"
#include "base/CCValue.h" #include "base/CCValue.h"
#include "base/CCData.h" #include "base/CCData.h"

2
cocos/platform/CCGL.h
View File

@ -26,7 +26,7 @@ THE SOFTWARE.
#ifndef __PLATFORM_CCGL_H__ #ifndef __PLATFORM_CCGL_H__
#define __PLATFORM_CCGL_H__ #define __PLATFORM_CCGL_H__
#include "base/CCPlatformConfig.h" #include "platform/CCPlatformConfig.h"
#if CC_TARGET_PLATFORM == CC_PLATFORM_MAC #if CC_TARGET_PLATFORM == CC_PLATFORM_MAC
#include "platform/mac/CCGL-mac.h" #include "platform/mac/CCGL-mac.h"

0
cocos/base/CCPlatformConfig.h → cocos/platform/CCPlatformConfig.h
View File

2
cocos/platform/CCPlatformDefine.h
View File

@ -26,7 +26,7 @@ THE SOFTWARE.
#ifndef __PLATFORM_CCPLATFORMDEFINE_H__ #ifndef __PLATFORM_CCPLATFORMDEFINE_H__
#define __PLATFORM_CCPLATFORMDEFINE_H__ #define __PLATFORM_CCPLATFORMDEFINE_H__
#include "base/CCPlatformConfig.h" #include "platform/CCPlatformConfig.h"
#if CC_TARGET_PLATFORM == CC_PLATFORM_MAC #if CC_TARGET_PLATFORM == CC_PLATFORM_MAC
#include "platform/mac/CCPlatformDefine-mac.h" #include "platform/mac/CCPlatformDefine-mac.h"

2
cocos/base/CCPlatformMacros.h → cocos/platform/CCPlatformMacros.h
View File

@ -29,7 +29,7 @@ Copyright (c) 2013-2014 Chukong Technologies
* define some platform specific macros * define some platform specific macros
*/ */
#include "base/ccConfig.h" #include "base/ccConfig.h"
#include "base/CCPlatformConfig.h" #include "platform/CCPlatformConfig.h"
#include "platform/CCPlatformDefine.h" #include "platform/CCPlatformDefine.h"
/** /**

2
cocos/platform/CCSAXParser.h
View File

@ -24,7 +24,7 @@
#ifndef __CCSAXPARSER_H__ #ifndef __CCSAXPARSER_H__
#define __CCSAXPARSER_H__ #define __CCSAXPARSER_H__
#include "base/CCPlatformConfig.h" #include "platform/CCPlatformConfig.h"
#include "platform/CCCommon.h" #include "platform/CCCommon.h"
#include <string> #include <string>

2
cocos/platform/CCStdC.h
View File

@ -26,7 +26,7 @@ THE SOFTWARE.
#ifndef __PLATFORM_CCSTDC_H__ #ifndef __PLATFORM_CCSTDC_H__
#define __PLATFORM_CCSTDC_H__ #define __PLATFORM_CCSTDC_H__
#include "base/CCPlatformConfig.h" #include "platform/CCPlatformConfig.h"
#if CC_TARGET_PLATFORM == CC_PLATFORM_MAC #if CC_TARGET_PLATFORM == CC_PLATFORM_MAC
#include "platform/mac/CCStdC-mac.h" #include "platform/mac/CCStdC-mac.h"

2
cocos/platform/CCThread.h
View File

@ -26,7 +26,7 @@ THE SOFTWARE.
#ifndef __CC_PLATFORM_THREAD_H__ #ifndef __CC_PLATFORM_THREAD_H__
#define __CC_PLATFORM_THREAD_H__ #define __CC_PLATFORM_THREAD_H__
#include "base/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
NS_CC_BEGIN NS_CC_BEGIN

2
cocos/platform/apple/CCFileUtils-apple.h
View File

@ -30,7 +30,7 @@
#include <vector> #include <vector>
#include "platform/CCFileUtils.h" #include "platform/CCFileUtils.h"
#include "base/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
#include "base/ccTypes.h" #include "base/ccTypes.h"
NS_CC_BEGIN NS_CC_BEGIN

2
cocos/platform/apple/CCLock-apple.h
View File

@ -26,7 +26,7 @@ THE SOFTWARE.
#ifndef __PLATFORM_IPHONE_PLATFORM_CCLOCK_H__ #ifndef __PLATFORM_IPHONE_PLATFORM_CCLOCK_H__
#define __PLATFORM_IPHONE_PLATFORM_CCLOCK_H__ #define __PLATFORM_IPHONE_PLATFORM_CCLOCK_H__
#include "base/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
NS_CC_BEGIN NS_CC_BEGIN

2
cocos/platform/ios/CCApplication-ios.h
View File

@ -26,7 +26,7 @@ THE SOFTWARE.
#ifndef __CC_APPLICATION_IOS_H__ #ifndef __CC_APPLICATION_IOS_H__
#define __CC_APPLICATION_IOS_H__ #define __CC_APPLICATION_IOS_H__
#include "base/CCPlatformConfig.h" #include "platform/CCPlatformConfig.h"
#if CC_TARGET_PLATFORM == CC_PLATFORM_IOS #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS
#include "platform/CCCommon.h" #include "platform/CCCommon.h"

2
cocos/platform/ios/CCCommon-ios.mm
View File

@ -23,7 +23,7 @@
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "base/CCPlatformConfig.h" #include "platform/CCPlatformConfig.h"
#if CC_TARGET_PLATFORM == CC_PLATFORM_IOS #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS
#include "platform/CCCommon.h" #include "platform/CCCommon.h"

2
cocos/platform/ios/CCDevice-ios.mm
View File

@ -24,7 +24,7 @@
****************************************************************************/ ****************************************************************************/
#include "base/CCPlatformConfig.h" #include "platform/CCPlatformConfig.h"
#if CC_TARGET_PLATFORM == CC_PLATFORM_IOS #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS
#include "CCDevice.h" #include "CCDevice.h"

2
cocos/platform/ios/CCDirectorCaller-ios.h
View File

@ -23,7 +23,7 @@
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "base/CCPlatformConfig.h" #include "platform/CCPlatformConfig.h"
#if CC_TARGET_PLATFORM == CC_PLATFORM_IOS #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>

2
cocos/platform/ios/CCDirectorCaller-ios.mm
View File

@ -23,7 +23,7 @@
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "base/CCPlatformConfig.h" #include "platform/CCPlatformConfig.h"
#if CC_TARGET_PLATFORM == CC_PLATFORM_IOS #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS
#import "CCDirectorCaller-ios.h" #import "CCDirectorCaller-ios.h"

2
cocos/platform/ios/CCEAGLView-ios.h
View File

@ -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 #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>

2
cocos/platform/ios/CCEAGLView-ios.mm
View File

@ -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 #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS
#import "CCEAGLView-ios.h" #import "CCEAGLView-ios.h"

2
cocos/platform/ios/CCES2Renderer-ios.h
View File

@ -28,7 +28,7 @@
// Only compile this code on iOS. These files should NOT be included on your Mac project. // 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. // 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 #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS
#import "CCESRenderer-ios.h" #import "CCESRenderer-ios.h"

4
cocos/platform/ios/CCES2Renderer-ios.m
View File

@ -28,12 +28,12 @@
// Only compile this code on iOS. These files should NOT be included on your Mac project. // 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. // 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 #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS
#import "CCES2Renderer-ios.h" #import "CCES2Renderer-ios.h"
#import "base/CCPlatformMacros.h" #import "platform/CCPlatformMacros.h"
#import "OpenGL_Internal-ios.h" #import "OpenGL_Internal-ios.h"
#if !defined(COCOS2D_DEBUG) || COCOS2D_DEBUG == 0 #if !defined(COCOS2D_DEBUG) || COCOS2D_DEBUG == 0

4
cocos/platform/ios/CCESRenderer-ios.h
View File

@ -28,10 +28,10 @@
// Only compile this code on iOS. These files should NOT be included on your Mac project. // 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. // 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 #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS
#include "base/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
#import <QuartzCore/QuartzCore.h> #import <QuartzCore/QuartzCore.h>
#import <OpenGLES/EAGL.h> #import <OpenGLES/EAGL.h>

2
cocos/platform/ios/CCGL-ios.h
View File

@ -26,7 +26,7 @@ THE SOFTWARE.
#ifndef __PLATFORM_IOS_CCGL_H__ #ifndef __PLATFORM_IOS_CCGL_H__
#define __PLATFORM_IOS_CCGL_H__ #define __PLATFORM_IOS_CCGL_H__
#include "base/CCPlatformConfig.h" #include "platform/CCPlatformConfig.h"
#if CC_TARGET_PLATFORM == CC_PLATFORM_IOS #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS
#define glClearDepth glClearDepthf #define glClearDepth glClearDepthf

2
cocos/platform/ios/CCGLViewImpl-ios.h
View File

@ -26,7 +26,7 @@
#ifndef __CC_EGLVIEWIMPL_IPHONE_H__ #ifndef __CC_EGLVIEWIMPL_IPHONE_H__
#define __CC_EGLVIEWIMPL_IPHONE_H__ #define __CC_EGLVIEWIMPL_IPHONE_H__
#include "base/CCPlatformConfig.h" #include "platform/CCPlatformConfig.h"
#if CC_TARGET_PLATFORM == CC_PLATFORM_IOS #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS
#include "base/CCRef.h" #include "base/CCRef.h"

2
cocos/platform/ios/CCGLViewImpl-ios.mm
View File

@ -23,7 +23,7 @@
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "base/CCPlatformConfig.h" #include "platform/CCPlatformConfig.h"
#if CC_TARGET_PLATFORM == CC_PLATFORM_IOS #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>

2
cocos/platform/ios/CCImage-ios.mm
View File

@ -23,7 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "base/CCPlatformConfig.h" #include "platform/CCPlatformConfig.h"
#if CC_TARGET_PLATFORM == CC_PLATFORM_IOS #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS
#import "platform/CCImage.h" #import "platform/CCImage.h"

2
cocos/platform/ios/CCPlatformDefine-ios.h
View File

@ -25,7 +25,7 @@ THE SOFTWARE.
#ifndef __CCPLATFORMDEFINE_H__ #ifndef __CCPLATFORMDEFINE_H__
#define __CCPLATFORMDEFINE_H__ #define __CCPLATFORMDEFINE_H__
#include "base/CCPlatformConfig.h" #include "platform/CCPlatformConfig.h"
#if CC_TARGET_PLATFORM == CC_PLATFORM_IOS #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS
#include <assert.h> #include <assert.h>

4
cocos/platform/ios/CCStdC-ios.h
View File

@ -26,10 +26,10 @@ THE SOFTWARE.
#ifndef __CC_STD_C_H__ #ifndef __CC_STD_C_H__
#define __CC_STD_C_H__ #define __CC_STD_C_H__
#include "base/CCPlatformConfig.h" #include "platform/CCPlatformConfig.h"
#if CC_TARGET_PLATFORM == CC_PLATFORM_IOS #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS
#include "base/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
#include <float.h> #include <float.h>
#include <math.h> #include <math.h>
#include <string.h> #include <string.h>

2
cocos/platform/ios/OpenGL_Internal-ios.h
View File

@ -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 #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS
/* Generic error reporting */ /* Generic error reporting */

2
cocos/platform/mac/CCApplication-mac.h
View File

@ -26,7 +26,7 @@ THE SOFTWARE.
#ifndef __CC_APPLICATION_MAC_H__ #ifndef __CC_APPLICATION_MAC_H__
#define __CC_APPLICATION_MAC_H__ #define __CC_APPLICATION_MAC_H__
#include "base/CCPlatformConfig.h" #include "platform/CCPlatformConfig.h"
#if CC_TARGET_PLATFORM == CC_PLATFORM_MAC #if CC_TARGET_PLATFORM == CC_PLATFORM_MAC
#include "platform/CCCommon.h" #include "platform/CCCommon.h"

2
cocos/platform/mac/CCApplication-mac.mm
View File

@ -23,7 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "base/CCPlatformConfig.h" #include "platform/CCPlatformConfig.h"
#if CC_TARGET_PLATFORM == CC_PLATFORM_MAC #if CC_TARGET_PLATFORM == CC_PLATFORM_MAC
#import "CCApplication.h" #import "CCApplication.h"

2
cocos/platform/mac/CCCommon-mac.mm
View File

@ -23,7 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "base/CCPlatformConfig.h" #include "platform/CCPlatformConfig.h"
#if CC_TARGET_PLATFORM == CC_PLATFORM_MAC #if CC_TARGET_PLATFORM == CC_PLATFORM_MAC
#include "platform/CCCommon.h" #include "platform/CCCommon.h"

2
cocos/platform/mac/CCDevice-mac.mm
View File

@ -23,7 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "base/CCPlatformConfig.h" #include "platform/CCPlatformConfig.h"
#if CC_TARGET_PLATFORM == CC_PLATFORM_MAC #if CC_TARGET_PLATFORM == CC_PLATFORM_MAC
#include "platform/CCDevice.h" #include "platform/CCDevice.h"

2
cocos/platform/mac/CCGL-mac.h
View File

@ -26,7 +26,7 @@ THE SOFTWARE.
#ifndef __PLATFORM_MAC_CCGL_H__ #ifndef __PLATFORM_MAC_CCGL_H__
#define __PLATFORM_MAC_CCGL_H__ #define __PLATFORM_MAC_CCGL_H__
#include "base/CCPlatformConfig.h" #include "platform/CCPlatformConfig.h"
#if CC_TARGET_PLATFORM == CC_PLATFORM_MAC #if CC_TARGET_PLATFORM == CC_PLATFORM_MAC
#import <OpenGL/gl.h> #import <OpenGL/gl.h>

2
cocos/platform/mac/CCPlatformDefine-mac.h
View File

@ -26,7 +26,7 @@ THE SOFTWARE.
#ifndef __CCPLATFORMDEFINE_H__ #ifndef __CCPLATFORMDEFINE_H__
#define __CCPLATFORMDEFINE_H__ #define __CCPLATFORMDEFINE_H__
#include "base/CCPlatformConfig.h" #include "platform/CCPlatformConfig.h"
#if CC_TARGET_PLATFORM == CC_PLATFORM_MAC #if CC_TARGET_PLATFORM == CC_PLATFORM_MAC
#include <assert.h> #include <assert.h>

4
cocos/platform/mac/CCStdC-mac.h
View File

@ -26,10 +26,10 @@ THE SOFTWARE.
#ifndef __CC_STD_C_H__ #ifndef __CC_STD_C_H__
#define __CC_STD_C_H__ #define __CC_STD_C_H__
#include "base/CCPlatformConfig.h" #include "platform/CCPlatformConfig.h"
#if CC_TARGET_PLATFORM == CC_PLATFORM_MAC #if CC_TARGET_PLATFORM == CC_PLATFORM_MAC
#include "base/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
#include <float.h> #include <float.h>
#include <math.h> #include <math.h>
#include <string.h> #include <string.h>

2
cocos/renderer/CCRenderCommand.h
View File

@ -28,7 +28,7 @@
#include <stdint.h> #include <stdint.h>
#include "base/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
#include "base/ccTypes.h" #include "base/ccTypes.h"
NS_CC_BEGIN NS_CC_BEGIN

2
cocos/renderer/CCRenderCommandPool.h
View File

@ -28,7 +28,7 @@
#include <list> #include <list>
#include "base/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
NS_CC_BEGIN NS_CC_BEGIN

2
cocos/renderer/CCRenderer.h
View File

@ -29,7 +29,7 @@
#include <vector> #include <vector>
#include <stack> #include <stack>
#include "base/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
#include "renderer/CCRenderCommand.h" #include "renderer/CCRenderCommand.h"
#include "renderer/CCGLProgram.h" #include "renderer/CCGLProgram.h"
#include "platform/CCGL.h" #include "platform/CCGL.h"

2
cocos/renderer/CCTexture2D.cpp
View File

@ -40,7 +40,7 @@ THE SOFTWARE.
#include "base/ccConfig.h" #include "base/ccConfig.h"
#include "base/ccMacros.h" #include "base/ccMacros.h"
#include "base/CCConfiguration.h" #include "base/CCConfiguration.h"
#include "base/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
#include "base/CCDirector.h" #include "base/CCDirector.h"
#include "renderer/CCGLProgram.h" #include "renderer/CCGLProgram.h"
#include "renderer/ccGLStateCache.h" #include "renderer/ccGLStateCache.h"

2
cocos/renderer/ccGLStateCache.h
View File

@ -31,7 +31,7 @@ THE SOFTWARE.
#include <cstdint> #include <cstdint>
#include "platform/CCGL.h" #include "platform/CCGL.h"
#include "base/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
NS_CC_BEGIN NS_CC_BEGIN

2
cocos/renderer/ccShaders.h
View File

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

2
cocos/storage/local-storage/LocalStorage-android.cpp
View File

@ -29,7 +29,7 @@
*/ */
#include "LocalStorage.h" #include "LocalStorage.h"
#include "base/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)

2
cocos/storage/local-storage/LocalStorage.cpp
View File

@ -28,7 +28,7 @@
*/ */
#include "LocalStorage.h" #include "LocalStorage.h"
#include "base/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
#if (CC_TARGET_PLATFORM != CC_PLATFORM_ANDROID) #if (CC_TARGET_PLATFORM != CC_PLATFORM_ANDROID)

2
cocos/ui/UIDeprecated.h
View File

@ -25,7 +25,7 @@
#ifndef cocos2d_libs_UIDeprecated_h #ifndef cocos2d_libs_UIDeprecated_h
#define cocos2d_libs_UIDeprecated_h #define cocos2d_libs_UIDeprecated_h
#include "base/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
#include "ui/UIWidget.h" #include "ui/UIWidget.h"
#include "ui/UILayout.h" #include "ui/UILayout.h"
#include "ui/UIListView.h" #include "ui/UIListView.h"

2
cocos/ui/UIEditBox/UIEditBoxImpl-android.h
View File

@ -26,7 +26,7 @@
#ifndef __UIEDITBOXIMPLANDROID_H__ #ifndef __UIEDITBOXIMPLANDROID_H__
#define __UIEDITBOXIMPLANDROID_H__ #define __UIEDITBOXIMPLANDROID_H__
#include "base/CCPlatformConfig.h" #include "platform/CCPlatformConfig.h"
#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)

2
cocos/ui/UIEditBox/UIEditBoxImpl-ios.h
View File

@ -26,7 +26,7 @@
#ifndef __UIEditBoxIMPLIOS_H__ #ifndef __UIEditBoxIMPLIOS_H__
#define __UIEditBoxIMPLIOS_H__ #define __UIEditBoxIMPLIOS_H__
#include "base/CCPlatformConfig.h" #include "platform/CCPlatformConfig.h"
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) #if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS)

2
cocos/ui/UIEditBox/UIEditBoxImpl-mac.h
View File

@ -26,7 +26,7 @@
#ifndef __UIEditBoxIMPLMAC_H__ #ifndef __UIEditBoxIMPLMAC_H__
#define __UIEditBoxIMPLMAC_H__ #define __UIEditBoxIMPLMAC_H__
#include "base/CCPlatformConfig.h" #include "platform/CCPlatformConfig.h"
#if (CC_TARGET_PLATFORM == CC_PLATFORM_MAC) #if (CC_TARGET_PLATFORM == CC_PLATFORM_MAC)

2
cocos/ui/UIEditBox/UIEditBoxImpl-win32.cpp
View File

@ -24,7 +24,7 @@
****************************************************************************/ ****************************************************************************/
#include "UIEditBoxImpl-win32.h" #include "UIEditBoxImpl-win32.h"
#include "base/CCPlatformConfig.h" #include "platform/CCPlatformConfig.h"
#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) #if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32)
#include "UIEditBox.h" #include "UIEditBox.h"

2
cocos/ui/UIEditBox/UIEditBoxImpl-win32.h
View File

@ -26,7 +26,7 @@
#ifndef __UIEditBoxIMPLWIN_H__ #ifndef __UIEditBoxIMPLWIN_H__
#define __UIEditBoxIMPLWIN_H__ #define __UIEditBoxIMPLWIN_H__
#include "base/CCPlatformConfig.h" #include "platform/CCPlatformConfig.h"
#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) #if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32)

2
cocos/ui/UIEditBox/UIEditBoxImpl-wp8.cpp
View File

@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "base/CCPlatformConfig.h" #include "platform/CCPlatformConfig.h"
#if (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) #if (CC_TARGET_PLATFORM == CC_PLATFORM_WP8)
#include "UIEditBoxImpl-wp8.h" #include "UIEditBoxImpl-wp8.h"

2
cocos/ui/UIEditBox/UIEditBoxImpl-wp8.h
View File

@ -24,7 +24,7 @@ THE SOFTWARE.
#ifndef __UIEditBoxIMPLWP8_H__ #ifndef __UIEditBoxIMPLWP8_H__
#define __UIEditBoxIMPLWP8_H__ #define __UIEditBoxIMPLWP8_H__
#include "base/CCPlatformConfig.h" #include "platform/CCPlatformConfig.h"
#if (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) #if (CC_TARGET_PLATFORM == CC_PLATFORM_WP8)
#include "UIEditBoxImpl.h" #include "UIEditBoxImpl.h"

Some files were not shown because too many files have changed in this diff Show More