From 3637dc7af76411ea0da49088da4a1c6cdf505038 Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Mon, 20 Apr 2015 00:13:02 +0200 Subject: [PATCH] (qb) Add CoreText --- Makefile.common | 4 ++++ qb/config.libs.sh | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Makefile.common b/Makefile.common index 5f81c8618c..539d20b8cf 100644 --- a/Makefile.common +++ b/Makefile.common @@ -225,6 +225,10 @@ ifeq ($(HAVE_COREAUDIO), 1) LIBS += -framework CoreServices -framework CoreAudio -framework AudioUnit endif +ifeq ($(HAVE_CORETEXT), 1) + OBJ += gfx/drivers_font_renderer/coretext.o +endif + ifeq ($(HAVE_OSS), 1) OBJ += audio/drivers/oss.o endif diff --git a/qb/config.libs.sh b/qb/config.libs.sh index 3f95252ea7..69e2a7624f 100644 --- a/qb/config.libs.sh +++ b/qb/config.libs.sh @@ -200,6 +200,8 @@ check_pkgconf PULSE libpulse check_lib COREAUDIO "-framework AudioUnit" AudioUnitInitialize +check_lib CORETEXT "-framework CoreText" CTFontCreateWithName + check_pkgconf SDL sdl 1.2.10 check_pkgconf SDL2 sdl2 2.0.0 @@ -367,6 +369,6 @@ add_define_make OS "$OS" # Creates config.mk and config.h. add_define_make GLOBAL_CONFIG_DIR "$GLOBAL_CONFIG_DIR" -VARS="RGUI LAKKA GLUI XMB ALSA OSS OSS_BSD OSS_LIB AL RSOUND ROAR JACK COREAUDIO PULSE SDL SDL2 D3D9 DINPUT LIBUSB XINPUT DSOUND XAUDIO OPENGL EXYNOS DISPMANX SUNXI OMAP GLES GLES3 VG EGL KMS GBM DRM DYLIB GETOPT_LONG THREADS CG LIBXML2 ZLIB DYNAMIC FFMPEG AVCODEC AVFORMAT AVUTIL SWSCALE FREETYPE XKBCOMMON XVIDEO X11 XEXT XF86VM XINERAMA WAYLAND MALI_FBDEV VIVANTE_FBDEV NETWORKING NETPLAY NETWORK_CMD STDIN_CMD COMMAND SOCKET_LEGACY FBO STRL STRCASESTR MMAP PYTHON FFMPEG_ALLOC_CONTEXT3 FFMPEG_AVCODEC_OPEN2 FFMPEG_AVIO_OPEN FFMPEG_AVFORMAT_WRITE_HEADER FFMPEG_AVFORMAT_NEW_STREAM FFMPEG_AVCODEC_ENCODE_AUDIO2 FFMPEG_AVCODEC_ENCODE_VIDEO2 BSV_MOVIE VIDEOCORE NEON FLOATHARD FLOATSOFTFP UDEV V4L2 AV_CHANNEL_LAYOUT 7ZIP PARPORT" +VARS="RGUI LAKKA GLUI XMB ALSA OSS OSS_BSD OSS_LIB AL RSOUND ROAR JACK COREAUDIO CORETEXT PULSE SDL SDL2 D3D9 DINPUT LIBUSB XINPUT DSOUND XAUDIO OPENGL EXYNOS DISPMANX SUNXI OMAP GLES GLES3 VG EGL KMS GBM DRM DYLIB GETOPT_LONG THREADS CG LIBXML2 ZLIB DYNAMIC FFMPEG AVCODEC AVFORMAT AVUTIL SWSCALE FREETYPE XKBCOMMON XVIDEO X11 XEXT XF86VM XINERAMA WAYLAND MALI_FBDEV VIVANTE_FBDEV NETWORKING NETPLAY NETWORK_CMD STDIN_CMD COMMAND SOCKET_LEGACY FBO STRL STRCASESTR MMAP PYTHON FFMPEG_ALLOC_CONTEXT3 FFMPEG_AVCODEC_OPEN2 FFMPEG_AVIO_OPEN FFMPEG_AVFORMAT_WRITE_HEADER FFMPEG_AVFORMAT_NEW_STREAM FFMPEG_AVCODEC_ENCODE_AUDIO2 FFMPEG_AVCODEC_ENCODE_VIDEO2 BSV_MOVIE VIDEOCORE NEON FLOATHARD FLOATSOFTFP UDEV V4L2 AV_CHANNEL_LAYOUT 7ZIP PARPORT" create_config_make config.mk $VARS create_config_header config.h $VARS