From da6b7987f1738132cd629e0bb25ccb725fb75e83 Mon Sep 17 00:00:00 2001
From: Rob Loach <robloach@gmail.com>
Date: Sun, 24 Jun 2018 11:00:21 -0400
Subject: [PATCH 1/3] freetype: Get DejaVuSansMono.ttf from the assets
 directory

---
 gfx/drivers_font_renderer/freetype.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/gfx/drivers_font_renderer/freetype.c b/gfx/drivers_font_renderer/freetype.c
index d690281e7c..73ffceacc2 100644
--- a/gfx/drivers_font_renderer/freetype.c
+++ b/gfx/drivers_font_renderer/freetype.c
@@ -24,6 +24,8 @@
 #include <file/file_path.h>
 #include <streams/file_stream.h>
 #include <retro_miscellaneous.h>
+#include <string/stdstring.h>
+#include "../../configuration.h"
 
 #ifdef WIIU
 #include <wiiu/os.h>
@@ -268,6 +270,7 @@ error:
  * but should hopefully work ... */
 
 static const char *font_paths[] = {
+   "assets://pkg/DejaVuSansMono.ttf",
 #if defined(_WIN32)
    "C:\\Windows\\Fonts\\consola.ttf",
    "C:\\Windows\\Fonts\\verdana.ttf",
@@ -295,9 +298,18 @@ static const char *font_renderer_ft_get_default_font(void)
    return "";
 #else
    size_t i;
+   settings_t *settings = config_get_ptr();
+   char asset_path[PATH_MAX_LENGTH];
 
    for (i = 0; i < ARRAY_SIZE(font_paths); i++)
    {
+      /* Check if we are getting the font from the assets directory. */
+      if (string_is_equal(font_paths[i], "assets://pkg/DejaVuSansMono.ttf"))
+      {
+         fill_pathname_join(asset_path, settings->paths.directory_assets, "pkg/DejaVuSansMono.ttf", PATH_MAX_LENGTH);
+         font_paths[i] = asset_path;
+      }
+
       if (filestream_exists(font_paths[i]))
          return font_paths[i];
    }

From 8a96062ed0dd4a3e4c17c123ec8aefb4098c77db Mon Sep 17 00:00:00 2001
From: Rob Loach <robloach@gmail.com>
Date: Sun, 24 Jun 2018 11:19:40 -0400
Subject: [PATCH 2/3] freetype: Rename to osd-font.tff

---
 gfx/drivers_font_renderer/freetype.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gfx/drivers_font_renderer/freetype.c b/gfx/drivers_font_renderer/freetype.c
index 73ffceacc2..609f44c5ff 100644
--- a/gfx/drivers_font_renderer/freetype.c
+++ b/gfx/drivers_font_renderer/freetype.c
@@ -270,7 +270,7 @@ error:
  * but should hopefully work ... */
 
 static const char *font_paths[] = {
-   "assets://pkg/DejaVuSansMono.ttf",
+   "assets://pkg/osd-font.ttf",
 #if defined(_WIN32)
    "C:\\Windows\\Fonts\\consola.ttf",
    "C:\\Windows\\Fonts\\verdana.ttf",
@@ -304,9 +304,9 @@ static const char *font_renderer_ft_get_default_font(void)
    for (i = 0; i < ARRAY_SIZE(font_paths); i++)
    {
       /* Check if we are getting the font from the assets directory. */
-      if (string_is_equal(font_paths[i], "assets://pkg/DejaVuSansMono.ttf"))
+      if (string_is_equal(font_paths[i], "assets://pkg/osd-font.ttf"))
       {
-         fill_pathname_join(asset_path, settings->paths.directory_assets, "pkg/DejaVuSansMono.ttf", PATH_MAX_LENGTH);
+         fill_pathname_join(asset_path, settings->paths.directory_assets, "pkg/osd-font.ttf", PATH_MAX_LENGTH);
          font_paths[i] = asset_path;
       }
 

From e4fe33f43744c8ade3c4b91bb9900e5720383ed7 Mon Sep 17 00:00:00 2001
From: Rob Loach <robloach@gmail.com>
Date: Sun, 24 Jun 2018 12:02:28 -0400
Subject: [PATCH 3/3] freetype: Add comment about assets://

---
 gfx/drivers_font_renderer/freetype.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gfx/drivers_font_renderer/freetype.c b/gfx/drivers_font_renderer/freetype.c
index 609f44c5ff..b0bef73a4a 100644
--- a/gfx/drivers_font_renderer/freetype.c
+++ b/gfx/drivers_font_renderer/freetype.c
@@ -270,6 +270,7 @@ error:
  * but should hopefully work ... */
 
 static const char *font_paths[] = {
+   /* Assets directory OSD Font, @see font_renderer_ft_get_default_font() */
    "assets://pkg/osd-font.ttf",
 #if defined(_WIN32)
    "C:\\Windows\\Fonts\\consola.ttf",