Fix macosx build on arm64

Author: nside

proj/cmake/platform_macosx.cmake

@@ -152,7 +152,7 @@ if( NOT ( "Xcode" STREQUAL "${CMAKE_GENERATOR}" ) )
 		message(STATUS "Found libtool - ${CMAKE_LIBTOOL}")
 		get_property(languages GLOBAL PROPERTY ENABLED_LANGUAGES)
 		foreach(lang ${languages})
-			set(CMAKE_${lang}_CREATE_STATIC_LIBRARY "${CMAKE_LIBTOOL} -static -arch_only x86_64 -o <TARGET> <LINK_FLAGS> <OBJECTS> ")
+			set(CMAKE_${lang}_CREATE_STATIC_LIBRARY "${CMAKE_LIBTOOL} -static -o <TARGET> <LINK_FLAGS> <OBJECTS> ")
 		endforeach()
 	endif()
 endif()

src/cinder/System.cpp

@@ -455,7 +455,11 @@ int System::getOsMajorVersion()
 		instance()->mOSMajorVersion = [[sysVerComponents firstObject] intValue];
 #elif defined( CINDER_MAC )
 		if( [[NSProcessInfo processInfo] respondsToSelector:@selector(operatingSystemVersion)] ) {
-			ShadowOSVersion version = ((ShadowOSVersion(*)(id, SEL))objc_msgSend_stret)([NSProcessInfo processInfo], @selector(operatingSystemVersion));
+#if defined(__LP64__) && __LP64__
+                        ShadowOSVersion version = ((ShadowOSVersion(*)(id, SEL))objc_msgSend)([NSProcessInfo processInfo], @selector(operatingSystemVersion));
+#else
+                        ShadowOSVersion version = ((ShadowOSVersion(*)(id, SEL))objc_msgSend_stret)([NSProcessInfo processInfo], @selector(operatingSystemVersion));
+#endif
 			instance()->mOSMajorVersion = (int32_t)version.majorVersion;
 		} else {
 	#pragma clang diagnostic push
@@ -487,7 +491,11 @@ int System::getOsMinorVersion()
 		instance()->mOSMinorVersion = [[sysVerComponents objectAtIndex:1] intValue];
 #elif defined( CINDER_MAC )
 		if( [[NSProcessInfo processInfo] respondsToSelector:@selector(operatingSystemVersion)] ) {
-			ShadowOSVersion version = ((ShadowOSVersion(*)(id, SEL))objc_msgSend_stret)([NSProcessInfo processInfo], @selector(operatingSystemVersion));
+#if defined(__LP64__) && __LP64__
+                        ShadowOSVersion version = ((ShadowOSVersion(*)(id, SEL))objc_msgSend)([NSProcessInfo processInfo], @selector(operatingSystemVersion));
+#else
+                        ShadowOSVersion version = ((ShadowOSVersion(*)(id, SEL))objc_msgSend_stret)([NSProcessInfo processInfo], @selector(operatingSystemVersion));
+#endif
 			instance()->mOSMinorVersion = (int32_t)version.minorVersion;
 		} else {
 	#pragma clang diagnostic push
@@ -522,7 +530,11 @@ int System::getOsBugFixVersion()
 			instance()->mOSBugFixVersion = 0;
 #elif defined( CINDER_MAC )
 		if( [[NSProcessInfo processInfo] respondsToSelector:@selector(operatingSystemVersion)] ) {
-			ShadowOSVersion version = ((ShadowOSVersion(*)(id, SEL))objc_msgSend_stret)([NSProcessInfo processInfo], @selector(operatingSystemVersion));
+#if defined(__LP64__) && __LP64__
+                        ShadowOSVersion version = ((ShadowOSVersion(*)(id, SEL))objc_msgSend)([NSProcessInfo processInfo], @selector(operatingSystemVersion));
+#else
+                        ShadowOSVersion version = ((ShadowOSVersion(*)(id, SEL))objc_msgSend_stret)([NSProcessInfo processInfo], @selector(operatingSystemVersion));
+#endif
 			instance()->mOSBugFixVersion = (int32_t)version.patchVersion;
 		} else {
 	#pragma clang diagnostic push