From ada5c76bdd4970676e3c496d7666d594db08510f Mon Sep 17 00:00:00 2001 From: Jeff Hutchinson Date: Mon, 9 Feb 2015 10:10:40 -0500 Subject: [PATCH] remove gestalt() as it has been deprecated and stopped working on Mac OS Yosemite --- .../{macCarbCPUInfo.cpp => osxCPUInfo.mm} | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) rename Engine/source/platformMac/{macCarbCPUInfo.cpp => osxCPUInfo.mm} (96%) diff --git a/Engine/source/platformMac/macCarbCPUInfo.cpp b/Engine/source/platformMac/osxCPUInfo.mm similarity index 96% rename from Engine/source/platformMac/macCarbCPUInfo.cpp rename to Engine/source/platformMac/osxCPUInfo.mm index f7b71f3ba..1457eb46e 100644 --- a/Engine/source/platformMac/macCarbCPUInfo.cpp +++ b/Engine/source/platformMac/osxCPUInfo.mm @@ -31,6 +31,10 @@ #include "console/console.h" #include "core/stringTable.h" +// Gestalt has been deprecated +// we now have to use NSProcessInfo +#import + // Original code by Sean O'Brien (http://www.garagegames.com/community/forums/viewthread/81815). @@ -88,16 +92,12 @@ void Processor::init() unsigned long long llraw; Con::printf( "System & Processor Information:" ); - - SInt32 MacVersion; - if( Gestalt( gestaltSystemVersion, &MacVersion ) == noErr ) - { - U32 revision = MacVersion & 0xf; - U32 minorVersion = ( MacVersion & 0xf0 ) >> 4; - U32 majorVersion = ( MacVersion & 0xff00 ) >> 8; - - Con::printf( " OSX Version: %x.%x.%x", majorVersion, minorVersion, revision ); - } + + // Gestalt has been deprecated since Mac OSX Mountain Lion and has stopped working on + // Mac OSX Yosemite. we have to use NSProcessInfo now. + // Availability: Mac OS 10.2 or greater. + NSString *osVersionStr = [[NSProcessInfo processInfo] operatingSystemVersionString]; + Con::printf( " OSX Version: %s", [osVersionStr UTF8String]); err = _getSysCTLstring("kern.ostype", buf, sizeof(buf)); if (err)