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

ios/mac project compeleted

This commit is contained in:
yusheng.lu 2014-12-22 20:08:27 +08:00
parent 2de5ba7c2f
commit 1e05361873
2 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1253,6 +1253,12 @@
38B8E2E219E671D2002D7CE7 /* UILayoutComponent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38B8E2DF19E671D2002D7CE7 /* UILayoutComponent.cpp */; };
38B8E2E319E671D2002D7CE7 /* UILayoutComponent.h in Headers */ = {isa = PBXBuildFile; fileRef = 38B8E2E019E671D2002D7CE7 /* UILayoutComponent.h */; };
38B8E2E419E671D2002D7CE7 /* UILayoutComponent.h in Headers */ = {isa = PBXBuildFile; fileRef = 38B8E2E019E671D2002D7CE7 /* UILayoutComponent.h */; };
38F5263E1A48363B000DB7F7 /* ArmatureNodeReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38F5263B1A48363B000DB7F7 /* ArmatureNodeReader.cpp */; };
38F5263F1A48363B000DB7F7 /* ArmatureNodeReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38F5263B1A48363B000DB7F7 /* ArmatureNodeReader.cpp */; };
38F526401A48363B000DB7F7 /* ArmatureNodeReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 38F5263C1A48363B000DB7F7 /* ArmatureNodeReader.h */; };
38F526411A48363B000DB7F7 /* ArmatureNodeReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 38F5263C1A48363B000DB7F7 /* ArmatureNodeReader.h */; };
38F526421A48363B000DB7F7 /* CSArmatureNode_generated.h in Headers */ = {isa = PBXBuildFile; fileRef = 38F5263D1A48363B000DB7F7 /* CSArmatureNode_generated.h */; };
38F526431A48363B000DB7F7 /* CSArmatureNode_generated.h in Headers */ = {isa = PBXBuildFile; fileRef = 38F5263D1A48363B000DB7F7 /* CSArmatureNode_generated.h */; };
3E2BDADE19C030ED0055CDCD /* AudioEngine.h in Headers */ = {isa = PBXBuildFile; fileRef = 3E2BDADD19C030ED0055CDCD /* AudioEngine.h */; };
3E2BDAEC19C0436F0055CDCD /* AudioEngine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E2BDAEB19C0436F0055CDCD /* AudioEngine.cpp */; };
3E2F27A619CFBFE100E7C490 /* AudioEngine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E2BDAEB19C0436F0055CDCD /* AudioEngine.cpp */; };
@ -2439,6 +2445,9 @@
38B8E2D419E66581002D7CE7 /* CSLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSLoader.h; sourceTree = "<group>"; };
38B8E2DF19E671D2002D7CE7 /* UILayoutComponent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UILayoutComponent.cpp; sourceTree = "<group>"; };
38B8E2E019E671D2002D7CE7 /* UILayoutComponent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UILayoutComponent.h; sourceTree = "<group>"; };
38F5263B1A48363B000DB7F7 /* ArmatureNodeReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ArmatureNodeReader.cpp; sourceTree = "<group>"; };
38F5263C1A48363B000DB7F7 /* ArmatureNodeReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ArmatureNodeReader.h; sourceTree = "<group>"; };
38F5263D1A48363B000DB7F7 /* CSArmatureNode_generated.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSArmatureNode_generated.h; sourceTree = "<group>"; };
3E2BDADD19C030ED0055CDCD /* AudioEngine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AudioEngine.h; sourceTree = "<group>"; };
3E2BDAEB19C0436F0055CDCD /* AudioEngine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AudioEngine.cpp; sourceTree = "<group>"; };
3E6176551960F89B00DE83F5 /* CCController-iOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = "CCController-iOS.mm"; path = "../base/CCController-iOS.mm"; sourceTree = "<group>"; };
@ -4354,6 +4363,16 @@
path = SpriteReader;
sourceTree = "<group>";
};
38F5263A1A48363B000DB7F7 /* ArmatureNodeReader */ = {
isa = PBXGroup;
children = (
38F5263B1A48363B000DB7F7 /* ArmatureNodeReader.cpp */,
38F5263C1A48363B000DB7F7 /* ArmatureNodeReader.h */,
38F5263D1A48363B000DB7F7 /* CSArmatureNode_generated.h */,
);
path = ArmatureNodeReader;
sourceTree = "<group>";
};
46A15FD01807A56F005B8026 /* audio */ = {
isa = PBXGroup;
children = (
@ -4955,6 +4974,7 @@
50FCEB6818C72017004AD434 /* WidgetReader */ = {
isa = PBXGroup;
children = (
38F5263A1A48363B000DB7F7 /* ArmatureNodeReader */,
382384251A2590F9002C4610 /* NodeReader */,
3823843A1A259140002C4610 /* SingleNodeReader */,
382384411A25915C002C4610 /* SpriteReader */,
@ -5200,6 +5220,7 @@
15AE180A19AAD2F700C27E9E /* CCAABB.h in Headers */,
46A170E71807CECA005B8026 /* CCPhysicsBody.h in Headers */,
15AE1A5A19AAD40300C27E9E /* b2StackAllocator.h in Headers */,
38F526401A48363B000DB7F7 /* ArmatureNodeReader.h in Headers */,
B29A7E3119EE1B7700872B35 /* SkinnedMeshAttachment.h in Headers */,
15AE1B6F19AADA9900C27E9E /* GUIDefine.h in Headers */,
15AE1A8119AAD40300C27E9E /* b2FrictionJoint.h in Headers */,
@ -5328,6 +5349,7 @@
15AE1B6C19AADA9900C27E9E /* UIWidget.h in Headers */,
15AE180E19AAD2F700C27E9E /* CCAnimate3D.h in Headers */,
1A5701B3180BCB590088DEC7 /* CCFontFNT.h in Headers */,
38F526421A48363B000DB7F7 /* CSArmatureNode_generated.h in Headers */,
15AE1BD919AAE01E00C27E9E /* CCControlStepper.h in Headers */,
15AE192119AAD35000C27E9E /* CocoStudio.h in Headers */,
15AE18A119AAD33D00C27E9E /* CCNodeLoaderListener.h in Headers */,
@ -5952,6 +5974,7 @@
15AE1AA819AAD40300C27E9E /* b2Island.h in Headers */,
15B3708B19EE414C00ABE682 /* Manifest.h in Headers */,
1A570213180BCBF40088DEC7 /* CCProgressTimer.h in Headers */,
38F526431A48363B000DB7F7 /* CSArmatureNode_generated.h in Headers */,
B37510821823ACA100B3BA6A /* CCPhysicsJointInfo_chipmunk.h in Headers */,
1A570217180BCBF40088DEC7 /* CCRenderTexture.h in Headers */,
15AE1ABB19AAD40300C27E9E /* b2EdgeAndPolygonContact.h in Headers */,
@ -5983,6 +6006,7 @@
15AE1A3B19AAD3D500C27E9E /* b2BroadPhase.h in Headers */,
15AE195619AAD35100C27E9E /* CCDisplayManager.h in Headers */,
15AE1B8719AADA9A00C27E9E /* UIButton.h in Headers */,
38F526411A48363B000DB7F7 /* ArmatureNodeReader.h in Headers */,
50ABBE441925AB6F00A911A9 /* CCDirector.h in Headers */,
5034CA4A191D591100CE6051 /* ccShader_Label_df.frag in Headers */,
15AE1B7519AADA9A00C27E9E /* UILoadingBar.h in Headers */,
@ -6523,6 +6547,7 @@
382383F01A258FA7002C4610 /* flatc.cpp in Sources */,
1A57028A180BCC900088DEC7 /* CCSpriteFrameCache.cpp in Sources */,
15AE18E619AAD35000C27E9E /* CCActionFrameEasing.cpp in Sources */,
38F5263E1A48363B000DB7F7 /* ArmatureNodeReader.cpp in Sources */,
B29A7DC919EE1B7700872B35 /* SlotData.c in Sources */,
15AE190F19AAD35000C27E9E /* CCInputDelegate.cpp in Sources */,
15AE181A19AAD2F700C27E9E /* CCBundle3D.cpp in Sources */,
@ -7006,6 +7031,7 @@
15AE19B619AAD39700C27E9E /* TextBMFontReader.cpp in Sources */,
15AE1BFD19AAE01E00C27E9E /* CCInvocation.cpp in Sources */,
B24AA98A195A675C007B4522 /* CCFastTMXTiledMap.cpp in Sources */,
38F5263F1A48363B000DB7F7 /* ArmatureNodeReader.cpp in Sources */,
15AE18CE19AAD33D00C27E9E /* CCNodeLoader.cpp in Sources */,
38ACD1FD1A27111900C3093D /* WidgetCallBackHandlerProtocol.cpp in Sources */,
29394CF719B01DBA00D2DE1A /* UIWebViewImpl-ios.mm in Sources */,

3
cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp
View File

@ -57,6 +57,7 @@
#include "cocostudio/WidgetReader/ScrollViewReader/ScrollViewReader.h"
#include "cocostudio/WidgetReader/PageViewReader/PageViewReader.h"
#include "cocostudio/WidgetReader/ListViewReader/ListViewReader.h"
#include "cocostudio/WidgetReader/ArmatureNodeReader/ArmatureNodeReader.h"
#include "flatbuffers/flatbuffers.h"
#include "flatbuffers/util.h"
@ -200,6 +201,8 @@ CSLoader::CSLoader()
CREATE_CLASS_NODE_READER_INFO(PageViewReader);
CREATE_CLASS_NODE_READER_INFO(ListViewReader);
CREATE_CLASS_NODE_READER_INFO(ArmatureNodeReader);
}
void CSLoader::purge()