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

Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x into v3

This commit is contained in:
2youyou2 2014-06-13 14:41:52 +08:00
parent 1c5d9ba212 3340d48c63
commit c37e2a6e4a
1 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -995,18 +995,6 @@
2AC795EA1862875D005EC8E1 /* BoundingBoxAttachment.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AC795D418628672005EC8E1 /* BoundingBoxAttachment.h */; };
373B9129187891F400198F86 /* CCComBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 373B910718787C0B00198F86 /* CCComBase.h */; };
373B912A187891FB00198F86 /* CCComBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 373B910718787C0B00198F86 /* CCComBase.h */; };
38FA2E111949569800FF2BE4 /* CCFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38FA2E031949569800FF2BE4 /* CCFrame.cpp */; };
38FA2E121949569800FF2BE4 /* CCFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38FA2E031949569800FF2BE4 /* CCFrame.cpp */; };
38FA2E131949569800FF2BE4 /* CCFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 38FA2E041949569800FF2BE4 /* CCFrame.h */; };
38FA2E141949569800FF2BE4 /* CCFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 38FA2E041949569800FF2BE4 /* CCFrame.h */; };
38FA2E191949569800FF2BE4 /* CCTimeLine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38FA2E071949569800FF2BE4 /* CCTimeLine.cpp */; };
38FA2E1A1949569800FF2BE4 /* CCTimeLine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38FA2E071949569800FF2BE4 /* CCTimeLine.cpp */; };
38FA2E1B1949569800FF2BE4 /* CCTimeLine.h in Headers */ = {isa = PBXBuildFile; fileRef = 38FA2E081949569800FF2BE4 /* CCTimeLine.h */; };
38FA2E1C1949569800FF2BE4 /* CCTimeLine.h in Headers */ = {isa = PBXBuildFile; fileRef = 38FA2E081949569800FF2BE4 /* CCTimeLine.h */; };
38FA2E1D1949569800FF2BE4 /* CCTimelineAction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38FA2E091949569800FF2BE4 /* CCTimelineAction.cpp */; };
38FA2E1E1949569800FF2BE4 /* CCTimelineAction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38FA2E091949569800FF2BE4 /* CCTimelineAction.cpp */; };
38FA2E1F1949569800FF2BE4 /* CCTimelineAction.h in Headers */ = {isa = PBXBuildFile; fileRef = 38FA2E0A1949569800FF2BE4 /* CCTimelineAction.h */; };
38FA2E201949569800FF2BE4 /* CCTimelineAction.h in Headers */ = {isa = PBXBuildFile; fileRef = 38FA2E0A1949569800FF2BE4 /* CCTimelineAction.h */; };
38FA2E211949569800FF2BE4 /* CCTimelineActionCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38FA2E0B1949569800FF2BE4 /* CCTimelineActionCache.cpp */; };
38FA2E221949569800FF2BE4 /* CCTimelineActionCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38FA2E0B1949569800FF2BE4 /* CCTimelineActionCache.cpp */; };
38FA2E231949569800FF2BE4 /* CCTimelineActionCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 38FA2E0C1949569800FF2BE4 /* CCTimelineActionCache.h */; };
@ -1015,6 +1003,18 @@
38FA2E351949C75600FF2BE4 /* CCNodeReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38FA2E321949C75600FF2BE4 /* CCNodeReader.cpp */; };
38FA2E361949C75600FF2BE4 /* CCNodeReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 38FA2E331949C75600FF2BE4 /* CCNodeReader.h */; };
38FA2E371949C75600FF2BE4 /* CCNodeReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 38FA2E331949C75600FF2BE4 /* CCNodeReader.h */; };
38FA2E49194AC61000FF2BE4 /* CCFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38FA2E43194AC61000FF2BE4 /* CCFrame.cpp */; };
38FA2E4A194AC61000FF2BE4 /* CCFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38FA2E43194AC61000FF2BE4 /* CCFrame.cpp */; };
38FA2E4B194AC61000FF2BE4 /* CCFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 38FA2E44194AC61000FF2BE4 /* CCFrame.h */; };
38FA2E4C194AC61000FF2BE4 /* CCFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 38FA2E44194AC61000FF2BE4 /* CCFrame.h */; };
38FA2E4D194AC61000FF2BE4 /* CCTimeLine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38FA2E45194AC61000FF2BE4 /* CCTimeLine.cpp */; };
38FA2E4E194AC61000FF2BE4 /* CCTimeLine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38FA2E45194AC61000FF2BE4 /* CCTimeLine.cpp */; };
38FA2E4F194AC61000FF2BE4 /* CCTimeLine.h in Headers */ = {isa = PBXBuildFile; fileRef = 38FA2E46194AC61000FF2BE4 /* CCTimeLine.h */; };
38FA2E50194AC61000FF2BE4 /* CCTimeLine.h in Headers */ = {isa = PBXBuildFile; fileRef = 38FA2E46194AC61000FF2BE4 /* CCTimeLine.h */; };
38FA2E51194AC61000FF2BE4 /* CCTimelineAction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38FA2E47194AC61000FF2BE4 /* CCTimelineAction.cpp */; };
38FA2E52194AC61000FF2BE4 /* CCTimelineAction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38FA2E47194AC61000FF2BE4 /* CCTimelineAction.cpp */; };
38FA2E53194AC61000FF2BE4 /* CCTimelineAction.h in Headers */ = {isa = PBXBuildFile; fileRef = 38FA2E48194AC61000FF2BE4 /* CCTimelineAction.h */; };
38FA2E54194AC61000FF2BE4 /* CCTimelineAction.h in Headers */ = {isa = PBXBuildFile; fileRef = 38FA2E48194AC61000FF2BE4 /* CCTimelineAction.h */; };
3EA0FB6B191C841D00B170C8 /* UIVideoPlayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 3EA0FB69191C841D00B170C8 /* UIVideoPlayer.h */; };
3EA0FB6C191C841D00B170C8 /* UIVideoPlayerIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3EA0FB6A191C841D00B170C8 /* UIVideoPlayerIOS.mm */; };
460E468118080832000CDD6D /* cocos-ext.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A167D21807AF4D005B8026 /* cocos-ext.h */; };
@ -2295,16 +2295,16 @@
37936A3C1869B76800E974DD /* reader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = reader.h; sourceTree = "<group>"; };
37936A3D1869B76800E974DD /* stringbuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = stringbuffer.h; sourceTree = "<group>"; };
37936A3E1869B76800E974DD /* writer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = writer.h; sourceTree = "<group>"; };
38FA2E031949569800FF2BE4 /* CCFrame.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCFrame.cpp; sourceTree = "<group>"; };
38FA2E041949569800FF2BE4 /* CCFrame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCFrame.h; sourceTree = "<group>"; };
38FA2E071949569800FF2BE4 /* CCTimeLine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCTimeLine.cpp; sourceTree = "<group>"; };
38FA2E081949569800FF2BE4 /* CCTimeLine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCTimeLine.h; sourceTree = "<group>"; };
38FA2E091949569800FF2BE4 /* CCTimelineAction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCTimelineAction.cpp; sourceTree = "<group>"; };
38FA2E0A1949569800FF2BE4 /* CCTimelineAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCTimelineAction.h; sourceTree = "<group>"; };
38FA2E0B1949569800FF2BE4 /* CCTimelineActionCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCTimelineActionCache.cpp; sourceTree = "<group>"; };
38FA2E0C1949569800FF2BE4 /* CCTimelineActionCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCTimelineActionCache.h; sourceTree = "<group>"; };
38FA2E321949C75600FF2BE4 /* CCNodeReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCNodeReader.cpp; sourceTree = "<group>"; };
38FA2E331949C75600FF2BE4 /* CCNodeReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCNodeReader.h; sourceTree = "<group>"; };
38FA2E43194AC61000FF2BE4 /* CCFrame.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCFrame.cpp; sourceTree = "<group>"; };
38FA2E44194AC61000FF2BE4 /* CCFrame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCFrame.h; sourceTree = "<group>"; };
38FA2E45194AC61000FF2BE4 /* CCTimeLine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCTimeLine.cpp; sourceTree = "<group>"; };
38FA2E46194AC61000FF2BE4 /* CCTimeLine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCTimeLine.h; sourceTree = "<group>"; };
38FA2E47194AC61000FF2BE4 /* CCTimelineAction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCTimelineAction.cpp; sourceTree = "<group>"; };
38FA2E48194AC61000FF2BE4 /* CCTimelineAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCTimelineAction.h; sourceTree = "<group>"; };
3EA0FB69191C841D00B170C8 /* UIVideoPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIVideoPlayer.h; sourceTree = "<group>"; };
3EA0FB6A191C841D00B170C8 /* UIVideoPlayerIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = UIVideoPlayerIOS.mm; sourceTree = "<group>"; };
46A15FCC1807A544005B8026 /* AUTHORS */ = {isa = PBXFileReference; lastKnownFileType = text; name = AUTHORS; path = ../AUTHORS; sourceTree = "<group>"; };
@ -3024,6 +3024,12 @@
1A570046180BC59A0088DEC7 /* actions */ = {
isa = PBXGroup;
children = (
38FA2E43194AC61000FF2BE4 /* CCFrame.cpp */,
38FA2E44194AC61000FF2BE4 /* CCFrame.h */,
38FA2E45194AC61000FF2BE4 /* CCTimeLine.cpp */,
38FA2E46194AC61000FF2BE4 /* CCTimeLine.h */,
38FA2E47194AC61000FF2BE4 /* CCTimelineAction.cpp */,
38FA2E48194AC61000FF2BE4 /* CCTimelineAction.h */,
2986667818B1B079000E39CA /* CCTweenFunction.cpp */,
2986667918B1B079000E39CA /* CCTweenFunction.h */,
1A570047180BC5A10088DEC7 /* CCAction.cpp */,
@ -4038,12 +4044,6 @@
children = (
38FA2E321949C75600FF2BE4 /* CCNodeReader.cpp */,
38FA2E331949C75600FF2BE4 /* CCNodeReader.h */,
38FA2E031949569800FF2BE4 /* CCFrame.cpp */,
38FA2E041949569800FF2BE4 /* CCFrame.h */,
38FA2E071949569800FF2BE4 /* CCTimeLine.cpp */,
38FA2E081949569800FF2BE4 /* CCTimeLine.h */,
38FA2E091949569800FF2BE4 /* CCTimelineAction.cpp */,
38FA2E0A1949569800FF2BE4 /* CCTimelineAction.h */,
38FA2E0B1949569800FF2BE4 /* CCTimelineActionCache.cpp */,
38FA2E0C1949569800FF2BE4 /* CCTimelineActionCache.h */,
);
@ -4897,7 +4897,6 @@
50ABBE8D1925AB6F00A911A9 /* CCNS.h in Headers */,
2AC795E218628723005EC8E1 /* BoundingBoxAttachment.h in Headers */,
06CAAAC9186AD7EE0012A414 /* TriggerMng.h in Headers */,
38FA2E131949569800FF2BE4 /* CCFrame.h in Headers */,
2905FA6018CF08D100240AA3 /* UILayoutParameter.h in Headers */,
50ABBEA51925AB6F00A911A9 /* CCScriptSupport.h in Headers */,
B29594D01926D61F003EEF37 /* CCSprite3DDataCache.h in Headers */,
@ -4923,6 +4922,7 @@
50ABBE731925AB6F00A911A9 /* CCEventListenerMouse.h in Headers */,
1A570063180BC5A10088DEC7 /* CCAction.h in Headers */,
1A570067180BC5A10088DEC7 /* CCActionCamera.h in Headers */,
38FA2E4B194AC61000FF2BE4 /* CCFrame.h in Headers */,
1A57006B180BC5A10088DEC7 /* CCActionCatmullRom.h in Headers */,
1A57006F180BC5A10088DEC7 /* CCActionEase.h in Headers */,
1A570073180BC5A10088DEC7 /* CCActionGrid.h in Headers */,
@ -5195,8 +5195,8 @@
2905FA5418CF08D100240AA3 /* UIImageView.h in Headers */,
1A8C59B5180E930E00EF57C3 /* CCBone.h in Headers */,
50ABBDAB1925AB4100A911A9 /* CCRenderCommandPool.h in Headers */,
38FA2E1B1949569800FF2BE4 /* CCTimeLine.h in Headers */,
5034CA45191D591100CE6051 /* ccShader_Label_outline.frag in Headers */,
38FA2E4F194AC61000FF2BE4 /* CCTimeLine.h in Headers */,
1A8C59B9180E930E00EF57C3 /* CCColliderDetector.h in Headers */,
1A8C59BD180E930E00EF57C3 /* CCComAttribute.h in Headers */,
1A8C59C1180E930E00EF57C3 /* CCComAudio.h in Headers */,
@ -5230,7 +5230,7 @@
1A8C59FD180E930E00EF57C3 /* CCTween.h in Headers */,
1A8C5A05180E930E00EF57C3 /* CCUtilMath.h in Headers */,
50ABC0091926664800A911A9 /* CCCommon.h in Headers */,
38FA2E1F1949569800FF2BE4 /* CCTimelineAction.h in Headers */,
38FA2E53194AC61000FF2BE4 /* CCTimelineAction.h in Headers */,
50ABBE531925AB6F00A911A9 /* CCEventDispatcher.h in Headers */,
1A8C5A07180E930E00EF57C3 /* CocoStudio.h in Headers */,
1A8C5A0F180E930E00EF57C3 /* DictionaryHelper.h in Headers */,
@ -5398,6 +5398,7 @@
2905FA6118CF08D100240AA3 /* UILayoutParameter.h in Headers */,
B29594C51926D61F003EEF37 /* CCMesh.h in Headers */,
50ABBE9C1925AB6F00A911A9 /* CCRef.h in Headers */,
38FA2E4C194AC61000FF2BE4 /* CCFrame.h in Headers */,
50ABBD961925AB4100A911A9 /* CCGLProgramState.h in Headers */,
46A171061807CECB005B8026 /* CCPhysicsWorld.h in Headers */,
50ABBDB41925AB4100A911A9 /* ccShaders.h in Headers */,
@ -5480,9 +5481,9 @@
1A5701C0180BCB5A0088DEC7 /* CCLabelAtlas.h in Headers */,
50ABBE681925AB6F00A911A9 /* CCEventListenerCustom.h in Headers */,
5034CA42191D591100CE6051 /* ccShader_Position_uColor.frag in Headers */,
38FA2E54194AC61000FF2BE4 /* CCTimelineAction.h in Headers */,
1A5701C4180BCB5A0088DEC7 /* CCLabelBMFont.h in Headers */,
50ABBDA61925AB4100A911A9 /* CCQuadCommand.h in Headers */,
38FA2E201949569800FF2BE4 /* CCTimelineAction.h in Headers */,
50ABBE9E1925AB6F00A911A9 /* CCRefPtr.h in Headers */,
1A01C69518F57BE800EFE3A6 /* CCFloat.h in Headers */,
1A5701CA180BCB5A0088DEC7 /* CCLabelTextFormatter.h in Headers */,
@ -5670,8 +5671,8 @@
1A9DCA2A180E6955007A3AD4 /* CCGLBufferedNode.h in Headers */,
1A01C69F18F57BE800EFE3A6 /* CCString.h in Headers */,
1A01C69118F57BE800EFE3A6 /* CCDictionary.h in Headers */,
38FA2E50194AC61000FF2BE4 /* CCTimeLine.h in Headers */,
1A8C598E180E930E00EF57C3 /* CCActionFrame.h in Headers */,
38FA2E1C1949569800FF2BE4 /* CCTimeLine.h in Headers */,
1A8C5992180E930E00EF57C3 /* CCActionFrameEasing.h in Headers */,
5034CA36191D591100CE6051 /* ccShader_PositionTexture.frag in Headers */,
1A8C5996180E930E00EF57C3 /* CCActionManagerEx.h in Headers */,
@ -5730,7 +5731,6 @@
1A8C59FA180E930E00EF57C3 /* CCTransformHelp.h in Headers */,
50ABBDAA1925AB4100A911A9 /* CCRenderCommand.h in Headers */,
1A8C59FE180E930E00EF57C3 /* CCTween.h in Headers */,
38FA2E141949569800FF2BE4 /* CCFrame.h in Headers */,
1A8C5A06180E930E00EF57C3 /* CCUtilMath.h in Headers */,
50ABBE601925AB6F00A911A9 /* CCEventListener.h in Headers */,
1A8C5A08180E930E00EF57C3 /* CocoStudio.h in Headers */,
@ -6105,7 +6105,7 @@
46A170EA1807CECA005B8026 /* CCPhysicsJoint.cpp in Sources */,
5027253C190BF1B900AAF4ED /* cocos2d.cpp in Sources */,
50ABC0611926664800A911A9 /* CCCommon.mm in Sources */,
38FA2E1D1949569800FF2BE4 /* CCTimelineAction.cpp in Sources */,
38FA2E51194AC61000FF2BE4 /* CCTimelineAction.cpp in Sources */,
50ABBDB11925AB4100A911A9 /* ccShaders.cpp in Sources */,
46A170EF1807CECA005B8026 /* CCPhysicsWorld.cpp in Sources */,
46A170ED1807CECA005B8026 /* CCPhysicsShape.cpp in Sources */,
@ -6224,9 +6224,9 @@
1A5702EE180BCE750088DEC7 /* CCTMXLayer.cpp in Sources */,
50ABBE691925AB6F00A911A9 /* CCEventListenerFocus.cpp in Sources */,
1A5702F2180BCE750088DEC7 /* CCTMXObjectGroup.cpp in Sources */,
38FA2E4D194AC61000FF2BE4 /* CCTimeLine.cpp in Sources */,
38FA2E341949C75600FF2BE4 /* CCNodeReader.cpp in Sources */,
1A5702F6180BCE750088DEC7 /* CCTMXTiledMap.cpp in Sources */,
38FA2E191949569800FF2BE4 /* CCTimeLine.cpp in Sources */,
1A5702FA180BCE750088DEC7 /* CCTMXXMLParser.cpp in Sources */,
50ABBD5C1925AB0000A911A9 /* Vec3.cpp in Sources */,
1A570300180BCE890088DEC7 /* CCParallaxNode.cpp in Sources */,
@ -6313,7 +6313,6 @@
2905FA7818CF08D100240AA3 /* UISlider.cpp in Sources */,
1AD71EE5180E26E600808F54 /* spine-cocos2dx.cpp in Sources */,
1AAF536A180E3374000584C8 /* HttpClient.cpp in Sources */,
38FA2E111949569800FF2BE4 /* CCFrame.cpp in Sources */,
50ABC0631926664800A911A9 /* CCDevice.mm in Sources */,
1AAF5372180E3374000584C8 /* SocketIO.cpp in Sources */,
50ABBE1F1925AB6F00A911A9 /* atitc.cpp in Sources */,
@ -6356,6 +6355,7 @@
299754F4193EC95400A54AC3 /* ObjectFactory.cpp in Sources */,
2905FA7C18CF08D100240AA3 /* UIText.cpp in Sources */,
50FCEB9F18C72017004AD434 /* LayoutReader.cpp in Sources */,
38FA2E49194AC61000FF2BE4 /* CCFrame.cpp in Sources */,
50ABC0211926664800A911A9 /* CCGLView.cpp in Sources */,
1A8C59C7180E930E00EF57C3 /* CCComRender.cpp in Sources */,
50ABC00D1926664800A911A9 /* CCFileUtils.cpp in Sources */,
@ -6561,6 +6561,7 @@
3EA0FB6C191C841D00B170C8 /* UIVideoPlayerIOS.mm in Sources */,
1A570062180BC5A10088DEC7 /* CCAction.cpp in Sources */,
1A570066180BC5A10088DEC7 /* CCActionCamera.cpp in Sources */,
38FA2E4A194AC61000FF2BE4 /* CCFrame.cpp in Sources */,
1A57006A180BC5A10088DEC7 /* CCActionCatmullRom.cpp in Sources */,
1A57006E180BC5A10088DEC7 /* CCActionEase.cpp in Sources */,
50ABBD8C1925AB4100A911A9 /* CCGLProgram.cpp in Sources */,
@ -6595,10 +6596,9 @@
1A57008E180BC5A10088DEC7 /* CCActionTiledGrid.cpp in Sources */,
1A570092180BC5A10088DEC7 /* CCActionTween.cpp in Sources */,
1A570099180BC5C10088DEC7 /* CCAtlasNode.cpp in Sources */,
38FA2E52194AC61000FF2BE4 /* CCTimelineAction.cpp in Sources */,
50ABBD4D1925AB0000A911A9 /* MathUtil.cpp in Sources */,
50ABBE3E1925AB6F00A911A9 /* CCDataVisitor.cpp in Sources */,
38FA2E1E1949569800FF2BE4 /* CCTimelineAction.cpp in Sources */,
38FA2E121949569800FF2BE4 /* CCFrame.cpp in Sources */,
1A57009F180BC5D20088DEC7 /* CCNode.cpp in Sources */,
B37510831823ACA100B3BA6A /* CCPhysicsShapeInfo_chipmunk.cpp in Sources */,
B29594CF1926D61F003EEF37 /* CCSprite3DDataCache.cpp in Sources */,
@ -6745,9 +6745,9 @@
1AD71EBE180E26E600808F54 /* CCSkeletonAnimation.cpp in Sources */,
50FCEBBC18C72017004AD434 /* TextBMFontReader.cpp in Sources */,
50ABBD391925AB0000A911A9 /* CCAffineTransform.cpp in Sources */,
38FA2E4E194AC61000FF2BE4 /* CCTimeLine.cpp in Sources */,
50ABBD841925AB4100A911A9 /* CCBatchCommand.cpp in Sources */,
1AD71EC2180E26E600808F54 /* extension.cpp in Sources */,
38FA2E1A1949569800FF2BE4 /* CCTimeLine.cpp in Sources */,
1AD71EC6180E26E600808F54 /* Json.cpp in Sources */,
1AD71ECA180E26E600808F54 /* RegionAttachment.cpp in Sources */,
1AD71ECE180E26E600808F54 /* Skeleton.cpp in Sources */,