From 147a9f85ff0199eaafce70726eb111efc75f9a8c Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 19 Apr 2015 16:18:58 +0200 Subject: [PATCH] (CoreText) Add HAVE_CORETEXT define --- apple/OSXPPC/RetroArch_OSX.xcodeproj/project.pbxproj | 1 + apple/RetroArch_OSX.xcodeproj/project.pbxproj | 1 + apple/iOS/RetroArch_iOS.xcodeproj/project.pbxproj | 1 + gfx/font_renderer_driver.c | 2 +- griffin/griffin.c | 2 +- 5 files changed, 5 insertions(+), 2 deletions(-) diff --git a/apple/OSXPPC/RetroArch_OSX.xcodeproj/project.pbxproj b/apple/OSXPPC/RetroArch_OSX.xcodeproj/project.pbxproj index 88fd44c44f..1e18dd14b8 100644 --- a/apple/OSXPPC/RetroArch_OSX.xcodeproj/project.pbxproj +++ b/apple/OSXPPC/RetroArch_OSX.xcodeproj/project.pbxproj @@ -282,6 +282,7 @@ ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = ( "-DHAVE_GRIFFIN", + "-DHAVE_CORETEXT", "-DHAVE_IOHIDMANAGER", "-DHAVE_RGUI", "-DHAVE_MENU", diff --git a/apple/RetroArch_OSX.xcodeproj/project.pbxproj b/apple/RetroArch_OSX.xcodeproj/project.pbxproj index 85d62f9459..aba32fb544 100644 --- a/apple/RetroArch_OSX.xcodeproj/project.pbxproj +++ b/apple/RetroArch_OSX.xcodeproj/project.pbxproj @@ -325,6 +325,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_CFLAGS = ( "-DHAVE_GRIFFIN", + "-DHAVE_CORETEXT", "-DHAVE_IOHIDMANAGER", "-DHAVE_LOCATION", "-DHAVE_RGUI", diff --git a/apple/iOS/RetroArch_iOS.xcodeproj/project.pbxproj b/apple/iOS/RetroArch_iOS.xcodeproj/project.pbxproj index 38b11ae32f..b89c9ee861 100644 --- a/apple/iOS/RetroArch_iOS.xcodeproj/project.pbxproj +++ b/apple/iOS/RetroArch_iOS.xcodeproj/project.pbxproj @@ -494,6 +494,7 @@ "-DHAVE_NETWORKING", "-DHAVE_CAMERA", "-DHAVE_GRIFFIN", + "-DHAVE_CORETEXT", "-DHAVE_LOCATION", "-DHAVE_RGUI", "-DHAVE_MENU", diff --git a/gfx/font_renderer_driver.c b/gfx/font_renderer_driver.c index 78bc700703..f65f76e18a 100644 --- a/gfx/font_renderer_driver.c +++ b/gfx/font_renderer_driver.c @@ -25,7 +25,7 @@ static const font_renderer_driver_t *font_backends[] = { #ifdef HAVE_FREETYPE &freetype_font_renderer, #endif -#ifdef __APPLE__ +#if defined(__APPLE__) && defined(HAVE_CORETEXT) &coretext_font_renderer, #endif &bitmap_font_renderer, diff --git a/griffin/griffin.c b/griffin/griffin.c index 53aa5d8daa..0382f75b55 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -247,7 +247,7 @@ FONTS #include "../gfx/drivers_font_renderer/freetype.c" #endif -#if defined(__APPLE__) +#if defined(__APPLE__) && defined(HAVE_CORETEXT) #include "../gfx/drivers_font_renderer/coretext.c" #endif