summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLawrence Rust <lvr@softsystem.co.uk>2011-03-16 03:04:04 (GMT)
committer Mark Kendall <mkendall@mythtv.org>2011-03-16 03:04:51 (GMT)
commitf525415a9bf32c6c1be8c57ceec067c10ccff9ad (patch)
tree8764195ef0e3a5499f9489a393fb2de1ce15de84
parente28fe982692d5578a047f7b9d1c92cfe50c97f5e (diff)
OSX: Cross compilation fixes for libmythui
Signed-off-by: Mark Kendall <mkendall@mythtv.org> (cherry picked from commit 7c60905a99248c19fd1279bd19a3d0af20a3e01c)
-rw-r--r--mythtv/libs/libmythui/DisplayResOSX.cpp2
-rw-r--r--mythtv/libs/libmythui/mythrender_opengl.cpp4
-rw-r--r--mythtv/libs/libmythui/util-osx-cocoa.mm2
3 files changed, 4 insertions, 4 deletions
diff --git a/mythtv/libs/libmythui/DisplayResOSX.cpp b/mythtv/libs/libmythui/DisplayResOSX.cpp
index f36cec0..e536542 100644
--- a/mythtv/libs/libmythui/DisplayResOSX.cpp
+++ b/mythtv/libs/libmythui/DisplayResOSX.cpp
@@ -1,8 +1,6 @@
#include "DisplayResOSX.h"
-#import <CoreGraphics/CGBase.h>
-#import <CoreGraphics/CGDisplayConfiguration.h>
#import <Carbon/Carbon.h>
#import <IOKit/graphics/IOGraphicsLib.h> // for IODisplayCreateInfoDictionary()
diff --git a/mythtv/libs/libmythui/mythrender_opengl.cpp b/mythtv/libs/libmythui/mythrender_opengl.cpp
index 66250c7..954f735 100644
--- a/mythtv/libs/libmythui/mythrender_opengl.cpp
+++ b/mythtv/libs/libmythui/mythrender_opengl.cpp
@@ -1216,8 +1216,10 @@ void MythRenderOpenGL::InitFeatures(void)
m_exts_supported = kGLFeatNone;
GLint maxtexsz = 0;
+ GLint maxunits = 0;
glGetIntegerv(GL_MAX_TEXTURE_SIZE, &maxtexsz);
- glGetIntegerv(GL_MAX_TEXTURE_UNITS, &m_max_units);
+ glGetIntegerv(GL_MAX_TEXTURE_UNITS, &maxunits);
+ m_max_units = maxunits;
m_max_tex_size = (maxtexsz) ? maxtexsz : 512;
m_extensions = (const char*) glGetString(GL_EXTENSIONS);
diff --git a/mythtv/libs/libmythui/util-osx-cocoa.mm b/mythtv/libs/libmythui/util-osx-cocoa.mm
index 4a3e0ee..e9c1729 100644
--- a/mythtv/libs/libmythui/util-osx-cocoa.mm
+++ b/mythtv/libs/libmythui/util-osx-cocoa.mm
@@ -48,5 +48,5 @@ CGDirectDisplayID GetOSXCocoaDisplay(void* view)
if (!screen)
return NULL;
NSDictionary* desc = [screen deviceDescription];
- return [[desc objectForKey:@"NSScreenNumber"] intValue];
+ return (CGDirectDisplayID)[[desc objectForKey:@"NSScreenNumber"] intValue];
}