walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix build with --coretext on iOS 

On iOS CoreText and CoreGraphics are stand-alone frameworks
This commit is contained in:
Konstantin Ritt 2014-03-20 16:01:30 +02:00 committed by Behdad Esfahbod
parent ea5e8a02eb
commit b96af03c20
2 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
configure.ac
View File

@ -342,15 +342,30 @@ AC_ARG_WITH(coretext,
have_coretext=false have_coretext=false
if test "x$with_coretext" = "xyes" -o "x$with_coretext" = "xauto"; then if test "x$with_coretext" = "xyes" -o "x$with_coretext" = "xauto"; then
AC_CHECK_TYPE(CTFontRef, have_coretext=true,, [#include <ApplicationServices/ApplicationServices.h>]) AC_CHECK_TYPE(CTFontRef, have_coretext=true,, [#include <ApplicationServices/ApplicationServices.h>])
if $have_coretext; then
CORETEXT_CFLAGS=
CORETEXT_LIBS="-framework ApplicationServices"
AC_SUBST(CORETEXT_CFLAGS)
AC_SUBST(CORETEXT_LIBS)
else
# On iOS CoreText and CoreGraphics are stand-alone frameworks
if test "x$have_coretext" != "xtrue"; then
AC_CHECK_TYPE(CTFontRef, have_coretext=true,, [#include <CoreText/CoreText.h>])
fi
if $have_coretext; then
CORETEXT_CFLAGS=
CORETEXT_LIBS="-framework CoreText -framework CoreGraphics"
AC_SUBST(CORETEXT_CFLAGS)
AC_SUBST(CORETEXT_LIBS)
fi
fi
fi fi
if test "x$with_coretext" = "xyes" -a "x$have_coretext" != "xtrue"; then if test "x$with_coretext" = "xyes" -a "x$have_coretext" != "xtrue"; then
AC_MSG_ERROR([CoreText support requested but libcoretext not found]) AC_MSG_ERROR([CoreText support requested but libcoretext not found])
fi fi
if $have_coretext; then if $have_coretext; then
CORETEXT_CFLAGS=
CORETEXT_LIBS="-framework ApplicationServices"
AC_SUBST(CORETEXT_CFLAGS)
AC_SUBST(CORETEXT_LIBS)
AC_DEFINE(HAVE_CORETEXT, 1, [Have Core Text backend]) AC_DEFINE(HAVE_CORETEXT, 1, [Have Core Text backend])
fi fi
AM_CONDITIONAL(HAVE_CORETEXT, $have_coretext) AM_CONDITIONAL(HAVE_CORETEXT, $have_coretext)

8
src/hb-coretext.h
View File

@ -29,7 +29,13 @@
#include "hb.h" #include "hb.h"
#include <ApplicationServices/ApplicationServices.h> #include <TargetConditionals.h>
#if defined(TARGET_OS_IPHONE)
# include <CoreText/CoreText.h>
# include <CoreGraphics/CoreGraphics.h>
#else
# include <ApplicationServices/ApplicationServices.h>
#endif
HB_BEGIN_DECLS HB_BEGIN_DECLS