OS X < 10.11 fixes

This commit is contained in:
Phillip Stephens 2016-07-05 14:47:04 -07:00
parent d9abcb8cf5
commit 96fe19cfc0
3 changed files with 12 additions and 3 deletions

View File

@ -71,6 +71,8 @@ elseif(APPLE)
find_library(OPENGL_LIBRARY OpenGL)
if (NOT CMAKE_OSX_DEPLOYMENT_TARGET OR CMAKE_OSX_DEPLOYMENT_TARGET VERSION_GREATER 10.10)
find_library(METAL_LIBRARY Metal)
else()
set(METAL_LIBRARY "")
endif()
find_library(QUARTZCORE_LIBRARY QuartzCore)
find_library(COREVIDEO_LIBRARY CoreVideo)

View File

@ -97,7 +97,7 @@ public:
if (!m_metalCtx.m_dev)
Log.report(logvisor::Info, "using OpenGL renderer");
#else
Log.report(LogVisor::Info, "using OpenGL renderer");
Log.report(logvisor::Info, "using OpenGL renderer");
#endif
}

View File

@ -520,10 +520,17 @@ IGraphicsContext* _GraphicsContextCocoaMetalNew(IGraphicsContext::EGraphicsAPI a
}
}
#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101100
- (NSArray<NSString*>*)validAttributesForMarkedText
{
return @[];
}
#else
- (NSArray*)validAttributesForMarkedText
{
return @[];
}
#endif
- (NSAttributedString*)attributedSubstringForProposedRange:(NSRange)aRange actualRange:(NSRangePointer)actualRange
{
@ -1342,7 +1349,7 @@ public:
void getWindowFrame(float& xOut, float& yOut, float& wOut, float& hOut) const
{
NSRect wFrame = m_nsWindow.contentView.frame;
NSRect wFrame = [[m_nsWindow contentView] frame];
xOut = wFrame.origin.x;
yOut = wFrame.origin.y;
wOut = wFrame.size.width;
@ -1351,7 +1358,7 @@ public:
void getWindowFrame(int& xOut, int& yOut, int& wOut, int& hOut) const
{
NSRect wFrame = m_nsWindow.contentView.frame;
NSRect wFrame = [[m_nsWindow contentView] frame];
xOut = wFrame.origin.x;
yOut = wFrame.origin.y;
wOut = wFrame.size.width;