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

Macro compatible

This commit is contained in:
halx99 2021-08-27 13:54:05 +08:00
parent 3990cc765d
commit 7dd7422abd
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/2d/CCNode.h
View File

@ -1869,7 +1869,7 @@ protected:
mutable Mat4 _inverse; ///< inverse transform mutable Mat4 _inverse; ///< inverse transform
mutable Mat4* _additionalTransform; ///< two transforms needed by additional transforms mutable Mat4* _additionalTransform; ///< two transforms needed by additional transforms
#if ADXE_LITTLE_ENDIAN #if CC_LITTLE_ENDIAN
union { union {
struct { struct {
std::uint32_t _orderOfArrival; std::uint32_t _orderOfArrival;

8
cocos/base/ccMacros.h
View File

@ -315,8 +315,8 @@ It should work same as apples CFSwapInt32LittleToHost(..)
/******************************************************************************************/ /******************************************************************************************/
#ifdef _WIN32 #ifdef _WIN32
// Assuming windows is always little-endian. // Assuming windows is always little-endian.
# if !defined(ADXE_DISABLE_LITTLE_ENDIAN_OPT_FOR_TEST) # if !defined(CC_DISABLE_LITTLE_ENDIAN_OPT_FOR_TEST)
# define ADXE_LITTLE_ENDIAN 1 # define CC_LITTLE_ENDIAN 1
# endif # endif
# if defined(_MSC_VER) && _MSC_VER >= 1300 && !defined(__INTEL_COMPILER) # if defined(_MSC_VER) && _MSC_VER >= 1300 && !defined(__INTEL_COMPILER)
// If MSVC has "/RTCc" set, it will complain about truncating casts at // If MSVC has "/RTCc" set, it will complain about truncating casts at
@ -335,8 +335,8 @@ It should work same as apples CFSwapInt32LittleToHost(..)
# endif # endif
# if ((defined(__LITTLE_ENDIAN__) && !defined(__BIG_ENDIAN__)) || \ # if ((defined(__LITTLE_ENDIAN__) && !defined(__BIG_ENDIAN__)) || \
(defined(__BYTE_ORDER) && __BYTE_ORDER == __LITTLE_ENDIAN)) && \ (defined(__BYTE_ORDER) && __BYTE_ORDER == __LITTLE_ENDIAN)) && \
!defined(ADXE_DISABLE_LITTLE_ENDIAN_OPT_FOR_TEST) !defined(CC_DISABLE_LITTLE_ENDIAN_OPT_FOR_TEST)
# define ADXE_LITTLE_ENDIAN 1 # define CC_LITTLE_ENDIAN 1
# endif # endif
#endif #endif