diff --git a/CMakeLists.txt b/CMakeLists.txt index 6ed6cc490..5d63415e6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,6 +23,10 @@ else() endif() if((${SPINE_SFML}) OR (${CMAKE_CURRENT_BINARY_DIR} MATCHES "spine-sfml")) + if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + set(CMAKE_OSX_ARCHITECTURES x86_64) + set(ONLY_ACTIVE_ARCH NO) + endif() add_subdirectory(spine-c) add_subdirectory(spine-sfml/c) add_subdirectory(spine-cpp) diff --git a/spine-cpp/spine-cpp/src/spine/SkeletonBinary.cpp b/spine-cpp/spine-cpp/src/spine/SkeletonBinary.cpp index e5a5fe32e..f484ea03c 100644 --- a/spine-cpp/spine-cpp/src/spine/SkeletonBinary.cpp +++ b/spine-cpp/spine-cpp/src/spine/SkeletonBinary.cpp @@ -169,10 +169,10 @@ SkeletonData *SkeletonBinary::readSkeletonData(const unsigned char *binary, cons SlotData *slotData = new (__FILE__, __LINE__) SlotData(i, String(slotName, true), *boneData); readColor(input, slotData->getColor()); + unsigned char a = readByte(input); unsigned char r = readByte(input); unsigned char g = readByte(input); unsigned char b = readByte(input); - unsigned char a = readByte(input); if (!(r == 0xff && g == 0xff && b == 0xff && a == 0xff)) { slotData->getDarkColor().set(r / 255.0f, g / 255.0f, b / 255.0f, 1); slotData->setHasDarkColor(true);