vlc | branch: master | Felix Paul Kühne <[email protected]> | Thu May 2 22:23:14 2013 +0100| [4e4b98e74f1278f9d5c99d7c0a90edf21fbe93f5] | committer: Jean-Baptiste Kempf
freetype: fixed compilation for non-Mac darwin platforms Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4e4b98e74f1278f9d5c99d7c0a90edf21fbe93f5 --- modules/text_renderer/freetype.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/text_renderer/freetype.c b/modules/text_renderer/freetype.c index a9787cb..1325d3e 100644 --- a/modules/text_renderer/freetype.c +++ b/modules/text_renderer/freetype.c @@ -103,7 +103,10 @@ /* apple stuff */ #ifdef __APPLE__ +#include <TargetConditionals.h> +#if !TARGET_OS_IPHONE #include <Carbon/Carbon.h> +#endif #include <sys/param.h> /* for MAXPATHLEN */ #undef HAVE_FONTCONFIG #define HAVE_STYLES @@ -736,6 +739,7 @@ fail: #endif /* HAVE_WIN32 */ #ifdef __APPLE__ +#if !TARGET_OS_IPHONE static char* MacLegacy_Select( filter_t *p_filter, const char* psz_fontname, bool b_bold, bool b_italic, int i_size, int *i_idx ) { @@ -815,6 +819,7 @@ static char* MacLegacy_Select( filter_t *p_filter, const char* psz_fontname, return psz_path; } #endif +#endif #endif /* HAVE_STYLES */ @@ -1997,7 +2002,9 @@ static FT_Face LoadFace( filter_t *p_filter, -1, &i_idx ); #elif defined( __APPLE__ ) +#if !TARGET_OS_IPHONE psz_fontfile = MacLegacy_Select( p_filter, p_style->psz_fontname, false, false, -1, &i_idx ); +#endif #elif defined( WIN32 ) psz_fontfile = Win32_Select( p_filter, p_style->psz_fontname, @@ -2911,7 +2918,9 @@ static int Create( vlc_object_t *p_this ) false, p_sys->i_default_font_size, &monofontindex ); #elif defined(__APPLE__) +#if !TARGET_OS_IPHONE psz_fontfile = MacLegacy_Select( p_filter, psz_fontfamily, false, false, 0, &fontindex ); +#endif #elif defined(WIN32) psz_fontfile = Win32_Select( p_filter, psz_fontfamily, false, false, p_sys->i_default_font_size, &fontindex ); _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
