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

cocos2dx/extensions/CCBReader/CCBReader.h

@@ -30,6 +30,8 @@
 #include "cocos2d.h"
 #include "CCBCustomClass.h"
 
+#define CCB_READER_VERSION 2
+
 NS_CC_EXT_BEGIN
 
 /**

cocos2dx/extensions/CCBReader/CCBReader_v1.cpp

@@ -23,6 +23,8 @@
  THE SOFTWARE.
  ****************************************************************************/
 
+#if CCB_READER_VERSION == 1
+
 #include "CCBReader.h"
 #include "CCBCustomClass.h"
 
@@ -705,3 +707,4 @@ CCNode* CCBReader::nodeGraphFromFile(const char* file, CCNode* owner)
     return nodeGraphFromDictionary(dict, NULL, ccbFileDir.c_str(), owner);
 }
 
+#endif

cocos2dx/extensions/CCBReader/CCBReader_v2.cpp

@@ -23,6 +23,8 @@
  THE SOFTWARE.
  ****************************************************************************/
 
+#if CCB_READER_VERSION == 2
+
 #include "CCBReader.h"
 #include "CCBCustomClass.h"
 
@@ -766,3 +768,4 @@ CCNode* CCBReader::nodeGraphFromFile(const char* file, CCNode* owner)
     return nodeGraphFromDictionary(dict, NULL, ccbFileDir.c_str(), owner);
 }
 
+#endif

cocos2dx/platform/CCThread.cpp

@@ -24,6 +24,9 @@ THE SOFTWARE.
 
 #include "CCThread.h"
 
+// iOS already has a CCThread.mm
+#if (CC_TARGET_PLATFORM != CC_PLATFORM_IOS)
+
 NS_CC_BEGIN
 
 CCThread::~CCThread()
@@ -37,3 +40,5 @@ void CCThread::createAutoreleasePool()
 }
 
 NS_CC_END
+
+#endif