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

Fix endian detection on Android (#18480) 

When compiling for Android, the preprocessor defines for byte order are
are not included in the sys/param.h chain. By including sys/endian.h we
we can ensure that the necessary macros are included.

It is especially important that endian-ness is correctly detected as the
node render order uses this information to sort #16262. Without this
fix, nodes will be rendered in the incorrect order on 64-bit Android
devices (on 32-bit, a different algorithm is used that is not
sensitive to byte order).
This commit is contained in:
Jonathon Walz 2017-11-22 19:36:30 -06:00 committed by minggo
parent 602b9e51f2
commit e890cfa6be
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cocos/base/ccMacros.h
View File

@ -296,6 +296,9 @@ CC_ASSERT(__gl_error_code == GL_NO_ERROR, "Error"); \
#endif
#else
#include <sys/param.h>
#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
#include <sys/endian.h>
#endif // CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID
#if ((defined(__LITTLE_ENDIAN__) && !defined(__BIG_ENDIAN__)) || \
(defined(__BYTE_ORDER) && __BYTE_ORDER == __LITTLE_ENDIAN))
#define CC_LITTLE_ENDIAN 1