Skip to content

Commit ce40635

Browse files
mariotakucscd98
authored andcommitted
added webOS default fonts
1 parent b1da352 commit ce40635

2 files changed

Lines changed: 12 additions & 5 deletions

File tree

Makefile.webos

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ HAVE_DR_MP3 = 1
6060
HAVE_DYNAMIC = 1
6161
HAVE_DYLIB = 1
6262
HAVE_EGL = 0
63-
HAVE_FREETYPE = 0
64-
HAVE_GDI = 1
63+
HAVE_FREETYPE = 1
64+
HAVE_GDI = 0
6565
HAVE_GETADDRINFO = 1
6666
HAVE_GETOPT_LONG = 1
6767
HAVE_GLSL = 1
@@ -107,7 +107,7 @@ HAVE_RUNAHEAD = 1
107107
HAVE_SDL = 0
108108
HAVE_SDL2 = 1
109109
HAVE_SHADERPIPELINE = 1
110-
HAVE_STB_FONT = 1
110+
HAVE_STB_FONT = 0
111111
HAVE_STB_IMAGE = 1
112112
HAVE_STB_VORBIS = 1
113113
HAVE_STDIN_CMD = 1
@@ -152,6 +152,7 @@ DEFINES += -DHAVE_SDL2
152152
DEFINES += -DHAVE_PULSE
153153
DEFINES += -DHAVE_NETWORKING -DHAVE_IFINFO -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_ASSETS -DHAVE_UPDATE_CORES
154154
DEFINES += -DHAVE_NETWORKGAMEPAD
155+
DEFINES += -DHAVE_FREETYPE
155156
DEFINES += -DHAVE_UPDATE_CORE_INFO
156157

157158
PKG_CONFIG=pkg-config
@@ -160,8 +161,10 @@ SDL2_CFLAGS := $(shell $(PKG_CONFIG) --cflags sdl2)
160161
SDL2_LIBS := $(shell $(PKG_CONFIG) --libs sdl2)
161162
OPENGLES_LIBS = -lGLESv2
162163
PULSE_LIBS = $(shell $(PKG_CONFIG) --libs libpulse)
163-
FREETYPE_CFLAGS := $(shell $(WEBOS_FREETYPE_CONFIG) --cflags)
164-
FREETYPE_LIBS := $(shell $(WEBOS_FREETYPE_CONFIG) --libs)
164+
FREETYPE_CFLAGS := $(shell $(PKG_CONFIG) --cflags freetype2)
165+
FREETYPE_LIBS := $(shell $(PKG_CONFIG) --libs freetype2)
166+
FONTCONFIG_CFLAGS := $(shell $(PKG_CONFIG) --cflags fontconfig)
167+
FONTCONFIG_LIBS := $(shell $(PKG_CONFIG) --libs fontconfig)
165168
MMAP_LIBS = -lc
166169
NEON_CFLAGS = -mfpu=neon
167170
NEON_ASFLAGS = -mfpu=neon

gfx/drivers_font_renderer/freetype.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -403,6 +403,10 @@ static const char *font_paths[] = {
403403
"/Library/Fonts/Microsoft/Candara.ttf",
404404
"/Library/Fonts/Verdana.ttf",
405405
"/Library/Fonts/Tahoma.ttf",
406+
#elif defined(WEBOS)
407+
"/usr/share/fonts/MuseoSans-Medium.ttf",
408+
"/usr/share/fonts/LG_Smart_UI-Regular.ttf",
409+
"/usr/share/fonts/DroidSans.ttf",
406410
#else
407411
"/usr/share/fonts/TTF/DejaVuSansMono.ttf",
408412
"/usr/share/fonts/TTF/DejaVuSans.ttf",

0 commit comments

Comments
 (0)