From 7d02925d7ea196fac3a07338aa8f3c41f5351a40 Mon Sep 17 00:00:00 2001
From: minggo <ming@cocos2d-x.org>
Date: Wed, 6 Feb 2013 11:15:54 +0800
Subject: [PATCH] issue #1703:include tinyxml2 files in android/iOS project

---
 cocos2dx/Android.mk                                            | 1 +
 cocos2dx/include/cocos2d.h                                     | 1 +
 cocos2dx/platform/CCSAXParser.cpp                              | 3 ++-
 .../proj.ios/cocos2dx.xcodeproj/project.pbxproj.REMOVED.git-id | 2 +-
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/cocos2dx/Android.mk b/cocos2dx/Android.mk
index e2f98ff7d4..3ca4c05a5b 100644
--- a/cocos2dx/Android.mk
+++ b/cocos2dx/Android.mk
@@ -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 \
diff --git a/cocos2dx/include/cocos2d.h b/cocos2dx/include/cocos2d.h
index f11931f7ef..00d43a786d 100755
--- a/cocos2dx/include/cocos2d.h
+++ b/cocos2dx/include/cocos2d.h
@@ -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"
diff --git a/cocos2dx/platform/CCSAXParser.cpp b/cocos2dx/platform/CCSAXParser.cpp
index ff2df55175..6d16d9a678 100644
--- a/cocos2dx/platform/CCSAXParser.cpp
+++ b/cocos2dx/platform/CCSAXParser.cpp
@@ -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;
diff --git a/cocos2dx/proj.ios/cocos2dx.xcodeproj/project.pbxproj.REMOVED.git-id b/cocos2dx/proj.ios/cocos2dx.xcodeproj/project.pbxproj.REMOVED.git-id
index 352084caa8..29c286720a 100644
--- a/cocos2dx/proj.ios/cocos2dx.xcodeproj/project.pbxproj.REMOVED.git-id
+++ b/cocos2dx/proj.ios/cocos2dx.xcodeproj/project.pbxproj.REMOVED.git-id
@@ -1 +1 @@
-433d0501dd611d9a2fcc65ace5e7a7b7adbf277f
\ No newline at end of file
+e0ec5ffa0601bc53df1e66ba286f2909eb2848dc
\ No newline at end of file