ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(Win32) Exclude HAVE_FONTCONFIG codepath for Windows for now

This commit is contained in:
twinaphex 2021-02-03 11:29:41 +01:00
parent 1348faa209
commit 4c97c22e00
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gfx/drivers_font_renderer/freetype.c
View File

@ -27,7 +27,13 @@
#include <retro_miscellaneous.h> #include <retro_miscellaneous.h>
#include <string/stdstring.h> #include <string/stdstring.h>
#ifdef HAVE_FONTCONFIG /* Was told by contributor that Windows support is pending,
* so exclude Windows for now */
#if defined(HAVE_FONTCONFIG) && !defined(_WIN32)
#define HAVE_FONTCONFIG_SUPPORT
#endif
#if defined(HAVE_FONTCONFIG_SUPPORT)
#include <fontconfig/fontconfig.h> #include <fontconfig/fontconfig.h>
#include "../../msg_hash.h" #include "../../msg_hash.h"
#endif #endif
@ -245,7 +251,7 @@ static void *font_renderer_ft_init(const char *font_path, float font_size)
err = FT_New_Memory_Face(handle->lib, font_data, font_size, 0, &handle->face); err = FT_New_Memory_Face(handle->lib, font_data, font_size, 0, &handle->face);
} }
else else
#elif HAVE_FONTCONFIG #elif defined(HAVE_FONTCONFIG_SUPPORT)
/* if fallback font is requested, instead of loading it, we find the full font in the system */ /* if fallback font is requested, instead of loading it, we find the full font in the system */
if (!*font_path || strstr(font_path, "fallback")) if (!*font_path || strstr(font_path, "fallback"))
{ {
@ -362,7 +368,7 @@ static const char *font_renderer_ft_get_default_font(void)
{ {
/* Since fontconfig will return parameters more than a simple path /* Since fontconfig will return parameters more than a simple path
we will process these in the init function */ we will process these in the init function */
#if defined(WIIU) || defined(HAVE_FONTCONFIG) #if defined(WIIU) || defined(HAVE_FONTCONFIG_SUPPORT)
return ""; return "";
#else #else
size_t i; size_t i;