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

Merge pull request #983 from NatWeiss/gles20 

Allows Cocos2D-X to be built for iOS including all cpp files
This commit is contained in:
minggo 2012-06-08 01:55:19 -07:00
parent ead12eb13e 6ee3db827c
commit 913707f259
4 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos2dx/extensions/CCBReader/CCBReader.h
View File

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

3
cocos2dx/extensions/CCBReader/CCBReader_v1.cpp
View File

@ -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

3
cocos2dx/extensions/CCBReader/CCBReader_v2.cpp
View File

@ -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

5
cocos2dx/platform/CCThread.cpp
View File

@ -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