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

issue #1703:include tinyxml2 files in android/iOS project

This commit is contained in:
minggo 2013-02-06 11:15:54 +08:00
parent 6e3409a30c
commit 7d02925d7e
4 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cocos2dx/Android.mk
View File

@ -113,6 +113,7 @@ support/ccUtils.cpp \
support/CCVertex.cpp \
support/data_support/ccCArray.cpp \
support/image_support/TGAlib.cpp \
support/tinyxml2/tinyxml2.cpp \
support/zip_support/ZipUtils.cpp \
support/zip_support/ioapi.cpp \
support/zip_support/unzip.cpp \

1
cocos2dx/include/cocos2d.h
View File

@ -215,6 +215,7 @@ THE SOFTWARE.
#include "support/CCProfiling.h"
#include "support/CCUserDefault.h"
#include "support/CCVertex.h"
#include "support/tinyxml2/tinyxml2.h"
// text_input_node
#include "text_input_node/CCIMEDelegate.h"

3
cocos2dx/platform/CCSAXParser.cpp
View File

@ -25,7 +25,7 @@
#include "CCSAXParser.h"
#include "cocoa/CCDictionary.h"
#include "CCFileUtils.h"
#include "tinyxml2/tinyxml2.h"
#include "support/tinyxml2/tinyxml2.h"
#include <vector> // because its based on windows 8 build :P
@ -66,6 +66,7 @@ bool XmlSaxHander::VisitEnter( const tinyxml2::XMLElement& element, const tinyxm
// nullptr is used in c++11
//attsVector.push_back(nullptr);
attsVector.push_back(NULL);
CCSAXParser::startElement(m_ccsaxParserImp, (const CC_XML_CHAR *)element.Value(), (const CC_XML_CHAR **)(&attsVector[0]));
return true;

2
cocos2dx/proj.ios/cocos2dx.xcodeproj/project.pbxproj.REMOVED.git-id
View File

@ -1 +1 @@
433d0501dd611d9a2fcc65ace5e7a7b7adbf277f
e0ec5ffa0601bc53df1e66ba286f2909eb2848dc