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

Merge branch 'OptimizationExtensionData' of https://github.com/chengstory/cocos2d-x into OptimizationExtensionData

This commit is contained in:
zhangcheng 2015-07-23 17:06:31 +08:00
parent 012053e163 16825a0ad3
commit caf27c4bc0
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1294,10 +1294,6 @@
382384451A25915C002C4610 /* SpriteReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 382384421A25915C002C4610 /* SpriteReader.cpp */; };
382384461A25915C002C4610 /* SpriteReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 382384431A25915C002C4610 /* SpriteReader.h */; };
382384471A25915C002C4610 /* SpriteReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 382384431A25915C002C4610 /* SpriteReader.h */; };
382F7ADC1AB1292A002EBECF /* CCObjectExtensionData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 382F7ADA1AB1292A002EBECF /* CCObjectExtensionData.cpp */; };
382F7ADD1AB1292A002EBECF /* CCObjectExtensionData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 382F7ADA1AB1292A002EBECF /* CCObjectExtensionData.cpp */; };
382F7ADE1AB1292A002EBECF /* CCObjectExtensionData.h in Headers */ = {isa = PBXBuildFile; fileRef = 382F7ADB1AB1292A002EBECF /* CCObjectExtensionData.h */; };
382F7ADF1AB1292A002EBECF /* CCObjectExtensionData.h in Headers */ = {isa = PBXBuildFile; fileRef = 382F7ADB1AB1292A002EBECF /* CCObjectExtensionData.h */; };
38ACD1FC1A27111900C3093D /* WidgetCallBackHandlerProtocol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38ACD1FA1A27111900C3093D /* WidgetCallBackHandlerProtocol.cpp */; };
38ACD1FD1A27111900C3093D /* WidgetCallBackHandlerProtocol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38ACD1FA1A27111900C3093D /* WidgetCallBackHandlerProtocol.cpp */; };
38ACD1FE1A27111900C3093D /* WidgetCallBackHandlerProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 38ACD1FB1A27111900C3093D /* WidgetCallBackHandlerProtocol.h */; };
@ -1338,6 +1334,10 @@
3EACC9A519F5014D00EB3C5E /* CCLight.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3EACC99E19F5014D00EB3C5E /* CCLight.cpp */; };
3EACC9A619F5014D00EB3C5E /* CCLight.h in Headers */ = {isa = PBXBuildFile; fileRef = 3EACC99F19F5014D00EB3C5E /* CCLight.h */; };
3EACC9A719F5014D00EB3C5E /* CCLight.h in Headers */ = {isa = PBXBuildFile; fileRef = 3EACC99F19F5014D00EB3C5E /* CCLight.h */; };
43015DBF1B60DF4000E75161 /* CCComExtensionData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43015DBD1B60DF4000E75161 /* CCComExtensionData.cpp */; };
43015DC01B60DF4000E75161 /* CCComExtensionData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43015DBD1B60DF4000E75161 /* CCComExtensionData.cpp */; };
43015DC11B60DF4000E75161 /* CCComExtensionData.h in Headers */ = {isa = PBXBuildFile; fileRef = 43015DBE1B60DF4000E75161 /* CCComExtensionData.h */; };
43015DC21B60DF4000E75161 /* CCComExtensionData.h in Headers */ = {isa = PBXBuildFile; fileRef = 43015DBE1B60DF4000E75161 /* CCComExtensionData.h */; };
464AD6E5197EBB1400E502D8 /* pvr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 464AD6E3197EBB1400E502D8 /* pvr.cpp */; };
464AD6E6197EBB1400E502D8 /* pvr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 464AD6E3197EBB1400E502D8 /* pvr.cpp */; };
464AD6E7197EBB1400E502D8 /* pvr.h in Headers */ = {isa = PBXBuildFile; fileRef = 464AD6E4197EBB1400E502D8 /* pvr.h */; };
@ -4104,8 +4104,6 @@
3823843C1A259140002C4610 /* SingleNodeReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SingleNodeReader.h; sourceTree = "<group>"; };
382384421A25915C002C4610 /* SpriteReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SpriteReader.cpp; sourceTree = "<group>"; };
382384431A25915C002C4610 /* SpriteReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SpriteReader.h; sourceTree = "<group>"; };
382F7ADA1AB1292A002EBECF /* CCObjectExtensionData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCObjectExtensionData.cpp; sourceTree = "<group>"; };
382F7ADB1AB1292A002EBECF /* CCObjectExtensionData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCObjectExtensionData.h; sourceTree = "<group>"; };
38ACD1FA1A27111900C3093D /* WidgetCallBackHandlerProtocol.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WidgetCallBackHandlerProtocol.cpp; sourceTree = "<group>"; };
38ACD1FB1A27111900C3093D /* WidgetCallBackHandlerProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WidgetCallBackHandlerProtocol.h; sourceTree = "<group>"; };
38B8E2D319E66581002D7CE7 /* CSLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSLoader.cpp; sourceTree = "<group>"; };
@ -4132,6 +4130,8 @@
3EACC99D19F5014D00EB3C5E /* CCCamera.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCCamera.h; sourceTree = "<group>"; };
3EACC99E19F5014D00EB3C5E /* CCLight.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCLight.cpp; sourceTree = "<group>"; };
3EACC99F19F5014D00EB3C5E /* CCLight.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCLight.h; sourceTree = "<group>"; };
43015DBD1B60DF4000E75161 /* CCComExtensionData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCComExtensionData.cpp; sourceTree = "<group>"; };
43015DBE1B60DF4000E75161 /* CCComExtensionData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCComExtensionData.h; sourceTree = "<group>"; };
464AD6E3197EBB1400E502D8 /* pvr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = pvr.cpp; path = ../base/pvr.cpp; sourceTree = "<group>"; };
464AD6E4197EBB1400E502D8 /* pvr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pvr.h; path = ../base/pvr.h; sourceTree = "<group>"; };
46A15FCC1807A544005B8026 /* AUTHORS */ = {isa = PBXFileReference; lastKnownFileType = text; name = AUTHORS; path = ../AUTHORS; sourceTree = "<group>"; };
@ -6330,8 +6330,6 @@
382384061A25900F002C4610 /* FlatBuffersSerialize.h */,
38ACD1FA1A27111900C3093D /* WidgetCallBackHandlerProtocol.cpp */,
38ACD1FB1A27111900C3093D /* WidgetCallBackHandlerProtocol.h */,
382F7ADA1AB1292A002EBECF /* CCObjectExtensionData.cpp */,
382F7ADB1AB1292A002EBECF /* CCObjectExtensionData.h */,
29E99D1C1957BA7000046604 /* CocoLoader.cpp */,
29E99D1D1957BA7000046604 /* CocoLoader.h */,
0634A4C4194B19E400E608AF /* ActionTimeline */,
@ -6375,6 +6373,8 @@
1A8C5965180E930E00EF57C3 /* CCComController.h */,
1A8C5966180E930E00EF57C3 /* CCComRender.cpp */,
1A8C5967180E930E00EF57C3 /* CCComRender.h */,
43015DBD1B60DF4000E75161 /* CCComExtensionData.cpp */,
43015DBE1B60DF4000E75161 /* CCComExtensionData.h */,
1A8C5968180E930E00EF57C3 /* CCDataReaderHelper.cpp */,
1A8C5969180E930E00EF57C3 /* CCDataReaderHelper.h */,
1A8C596A180E930E00EF57C3 /* CCDatas.cpp */,
@ -9412,6 +9412,7 @@
50ABBED51925AB6F00A911A9 /* utlist.h in Headers */,
1A5702F4180BCE750088DEC7 /* CCTMXObjectGroup.h in Headers */,
B6CAB1EF1AF9AA1A00B9B856 /* btBroadphaseProxy.h in Headers */,
43015DC11B60DF4000E75161 /* CCComExtensionData.h in Headers */,
B6CAB3871AF9AA1A00B9B856 /* btPersistentManifold.h in Headers */,
50ABBDAF1925AB4100A911A9 /* CCRenderer.h in Headers */,
B665E30C1AA80A6500DDB1C5 /* CCPUNoise.h in Headers */,
@ -9506,7 +9507,6 @@
B6CAB4351AF9AA1A00B9B856 /* btGpu3DGridBroadphase.h in Headers */,
50ABBE331925AB6F00A911A9 /* CCConfiguration.h in Headers */,
B665E2101AA80A6500DDB1C5 /* CCPUBaseForceAffector.h in Headers */,
382F7ADE1AB1292A002EBECF /* CCObjectExtensionData.h in Headers */,
B6CAB4D51AF9AA1A00B9B856 /* SpuGatheringCollisionTask.h in Headers */,
15AE199519AAD39600C27E9E /* LayoutReader.h in Headers */,
15AE183219AAD2F700C27E9E /* CCOBB.h in Headers */,
@ -10070,6 +10070,7 @@
15AE1A4F19AAD3D500C27E9E /* b2Shape.h in Headers */,
29394CF519B01DBA00D2DE1A /* UIWebViewImpl-ios.h in Headers */,
50ABBD5B1925AB0000A911A9 /* Vec2.h in Headers */,
43015DC21B60DF4000E75161 /* CCComExtensionData.h in Headers */,
D0FD035E1A3B51AA00825BB5 /* CCAllocatorStrategyGlobalSmallBlock.h in Headers */,
50ABBD411925AB0000A911A9 /* CCMath.h in Headers */,
1A5701A0180BCB590088DEC7 /* CCFont.h in Headers */,
@ -10440,7 +10441,6 @@
15AE185D19AAD31200C27E9E /* CocosDenshion.h in Headers */,
B6CAB3661AF9AA1A00B9B856 /* btContinuousConvexCollision.h in Headers */,
15AE194319AAD35100C27E9E /* CCColliderDetector.h in Headers */,
382F7ADF1AB1292A002EBECF /* CCObjectExtensionData.h in Headers */,
B6CAB3A81AF9AA1A00B9B856 /* btConstraintSolver.h in Headers */,
D0FD035C1A3B51AA00825BB5 /* CCAllocatorStrategyFixedBlock.h in Headers */,
15AE1BC419AADFFB00C27E9E /* ExtensionMacros.h in Headers */,
@ -11128,7 +11128,6 @@
B6CAB40B1AF9AA1A00B9B856 /* btMultiBodyJointMotor.cpp in Sources */,
B6CAB3D51AF9AA1A00B9B856 /* btSolve2LinearConstraint.cpp in Sources */,
B6CAB2591AF9AA1A00B9B856 /* btHashedSimplePairCache.cpp in Sources */,
382F7ADC1AB1292A002EBECF /* CCObjectExtensionData.cpp in Sources */,
B6DD2FAB1B04825B00E47F5F /* DetourDebugDraw.cpp in Sources */,
15AE191719AAD35000C27E9E /* CCSpriteFrameCacheHelper.cpp in Sources */,
B665E2E21AA80A6500DDB1C5 /* CCPULineAffectorTranslator.cpp in Sources */,
@ -11605,6 +11604,7 @@
50ABC05F1926664800A911A9 /* CCApplication-mac.mm in Sources */,
B29A7E2119EE1B7700872B35 /* PolygonBatch.cpp in Sources */,
15AE1A9219AAD40300C27E9E /* b2WheelJoint.cpp in Sources */,
43015DBF1B60DF4000E75161 /* CCComExtensionData.cpp in Sources */,
B665E3261AA80A6500DDB1C5 /* CCPUOnCollisionObserverTranslator.cpp in Sources */,
B6CAB3ED1AF9AA1A00B9B856 /* btRigidBody.cpp in Sources */,
B6CAAFFE1AF9A9E100B9B856 /* CCPhysicsSprite3D.cpp in Sources */,
@ -11696,7 +11696,6 @@
1A01C68F18F57BE800EFE3A6 /* CCDictionary.cpp in Sources */,
B276EF621988D1D500CD400F /* CCVertexIndexData.cpp in Sources */,
50ABBE561925AB6F00A911A9 /* CCEventFocus.cpp in Sources */,
382F7ADD1AB1292A002EBECF /* CCObjectExtensionData.cpp in Sources */,
15AE183D19AAD2F700C27E9E /* CCSkeleton3D.cpp in Sources */,
B6DD2FF21B04825B00E47F5F /* DetourTileCacheBuilder.cpp in Sources */,
503DD8E11926736A00CD74DD /* CCApplication-ios.mm in Sources */,
@ -11944,6 +11943,7 @@
15AE1A9419AAD40300C27E9E /* b2BlockAllocator.cpp in Sources */,
B29A7E3C19EE1B7700872B35 /* Animation.c in Sources */,
15AE1A4D19AAD3D500C27E9E /* b2PolygonShape.cpp in Sources */,
43015DC01B60DF4000E75161 /* CCComExtensionData.cpp in Sources */,
B6CAB3D61AF9AA1A00B9B856 /* btSolve2LinearConstraint.cpp in Sources */,
B6CAB30C1AF9AA1A00B9B856 /* btTriangleMeshShape.cpp in Sources */,
1A5701A2180BCB590088DEC7 /* CCFontAtlas.cpp in Sources */,