cocos2d/cocos2d-x — pull request #1481 by mrmop (2012-10-19 16:05:26+00:00)
Title: Marmalade Pull Requests

Hi,

I have added two commits on behalf of Marmalade.

Commit 1 - Marmalade Support - This basically adds proj.marmalade and Marmalade specific files and folders as well as implementation of numerous examples and the Cocos2d-x test bed. These changes do not affect the main Cocos2d-x code base

Commit 2 - Marmalade Cocos2d-x Main Repo Changes - These are direct changes to the main Cocos2d-x code base, basically a couple of improvements and a couple of critical changes that would need to be included into the main Cocos2d-x code base for Marmalade support to work without compiler errors. The critical changes include:

File: cocos2dx/include/cocos2d.h - We have added header includes that pull in various Marmalade Cocos2d-x platform specific headers (in the same way that the other platforms do)

File: cocos2dx/kazmath/include/kazmath/neon_matrix_impl.h - We have added an additional check for I3D_ARCH_ARM to enable compile on x86 and ARM builds under Marmalade.

Looking forward to your response

Thanks

Mat