diff --git a/Makefile.webos b/Makefile.webos index 01c15bd5c1..8a2ec10994 100644 --- a/Makefile.webos +++ b/Makefile.webos @@ -60,8 +60,8 @@ HAVE_DR_MP3 = 1 HAVE_DYNAMIC = 1 HAVE_DYLIB = 1 HAVE_EGL = 0 -HAVE_FREETYPE = 0 -HAVE_GDI = 1 +HAVE_FREETYPE = 1 +HAVE_GDI = 0 HAVE_GETADDRINFO = 1 HAVE_GETOPT_LONG = 1 HAVE_GLSL = 1 @@ -107,7 +107,7 @@ HAVE_RUNAHEAD = 1 HAVE_SDL = 0 HAVE_SDL2 = 1 HAVE_SHADERPIPELINE = 1 -HAVE_STB_FONT = 1 +HAVE_STB_FONT = 0 HAVE_STB_IMAGE = 1 HAVE_STB_VORBIS = 1 HAVE_STDIN_CMD = 1 @@ -152,6 +152,7 @@ DEFINES += -DHAVE_SDL2 DEFINES += -DHAVE_PULSE DEFINES += -DHAVE_NETWORKING -DHAVE_IFINFO -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_ASSETS -DHAVE_UPDATE_CORES DEFINES += -DHAVE_NETWORKGAMEPAD +DEFINES += -DHAVE_FREETYPE DEFINES += -DHAVE_UPDATE_CORE_INFO PKG_CONFIG=pkg-config @@ -160,8 +161,10 @@ SDL2_CFLAGS := $(shell $(PKG_CONFIG) --cflags sdl2) SDL2_LIBS := $(shell $(PKG_CONFIG) --libs sdl2) OPENGLES_LIBS = -lGLESv2 PULSE_LIBS = $(shell $(PKG_CONFIG) --libs libpulse) -FREETYPE_CFLAGS := $(shell $(WEBOS_FREETYPE_CONFIG) --cflags) -FREETYPE_LIBS := $(shell $(WEBOS_FREETYPE_CONFIG) --libs) +FREETYPE_CFLAGS := $(shell $(PKG_CONFIG) --cflags freetype2) +FREETYPE_LIBS := $(shell $(PKG_CONFIG) --libs freetype2) +FONTCONFIG_CFLAGS := $(shell $(PKG_CONFIG) --cflags fontconfig) +FONTCONFIG_LIBS := $(shell $(PKG_CONFIG) --libs fontconfig) MMAP_LIBS = -lc NEON_CFLAGS = -mfpu=neon NEON_ASFLAGS = -mfpu=neon diff --git a/gfx/drivers_font_renderer/freetype.c b/gfx/drivers_font_renderer/freetype.c index 2f014409ff..74a637ed35 100644 --- a/gfx/drivers_font_renderer/freetype.c +++ b/gfx/drivers_font_renderer/freetype.c @@ -403,6 +403,10 @@ static const char *font_paths[] = { "/Library/Fonts/Microsoft/Candara.ttf", "/Library/Fonts/Verdana.ttf", "/Library/Fonts/Tahoma.ttf", +#elif defined(WEBOS) + "/usr/share/fonts/MuseoSans-Medium.ttf", + "/usr/share/fonts/LG_Smart_UI-Regular.ttf", + "/usr/share/fonts/DroidSans.ttf", #else "/usr/share/fonts/TTF/DejaVuSansMono.ttf", "/usr/share/fonts/TTF/DejaVuSans.ttf",