diff --git a/Source/Engine/Physics/Actors/IPhysicsDebug.h b/Source/Engine/Physics/Actors/IPhysicsDebug.h index cedd3d822..57e9a97e3 100644 --- a/Source/Engine/Physics/Actors/IPhysicsDebug.h +++ b/Source/Engine/Physics/Actors/IPhysicsDebug.h @@ -12,7 +12,7 @@ public: { } }; -#define ImplementPhysicsDebug void DrawPhysicsDebug(RenderView& view) +#define ImplementPhysicsDebug void DrawPhysicsDebug(RenderView& view) override #else #define ImplementPhysicsDebug #endif diff --git a/Source/Engine/Platform/Mac/MacPlatform.cpp b/Source/Engine/Platform/Mac/MacPlatform.cpp index 6c7fbf533..6ba001f20 100644 --- a/Source/Engine/Platform/Mac/MacPlatform.cpp +++ b/Source/Engine/Platform/Mac/MacPlatform.cpp @@ -258,7 +258,10 @@ bool MacPlatform::Init() // Get device id { - io_registry_entry_t ioRegistryRoot = IORegistryEntryFromPath(kIOMasterPortDefault, "IOService:/"); +#if MAC_OS_X_VERSION_MAX_ALLOWED < 120000 +#define kIOMainPortDefault kIOMasterPortDefault +#endif + io_registry_entry_t ioRegistryRoot = IORegistryEntryFromPath(kIOMainPortDefault, "IOService:/"); CFStringRef deviceUuid = (CFStringRef)IORegistryEntryCreateCFProperty(ioRegistryRoot, CFSTR(kIOPlatformUUIDKey), kCFAllocatorDefault, 0); IOObjectRelease(ioRegistryRoot); String uuidStr = AppleUtils::ToString(deviceUuid);