From 5adb4500c75f59654beeaed845a206c6249ec985 Mon Sep 17 00:00:00 2001 From: Alessandro Toia Date: Mon, 12 Apr 2021 18:05:15 -0700 Subject: [PATCH] Install forkawesome font file --- build.sh | 1 + {icons => data}/forkawesome-webfont.ttf | Bin src/font.cpp | 4 ++-- src/meson.build | 4 +++- 4 files changed, 6 insertions(+), 3 deletions(-) rename {icons => data}/forkawesome-webfont.ttf (100%) diff --git a/build.sh b/build.sh index 1e297c85..ead23a32 100755 --- a/build.sh +++ b/build.sh @@ -211,6 +211,7 @@ install() { /usr/bin/install -Dvm644 ./build/release/usr/share/vulkan/implicit_layer.d/MangoHud.json /usr/share/vulkan/implicit_layer.d/MangoHud.json /usr/bin/install -Dvm644 ./build/release/usr/share/man/man1/mangohud.1 /usr/share/man/man1/mangohud.1 /usr/bin/install -Dvm644 ./build/release/usr/share/doc/mangohud/MangoHud.conf.example /usr/share/doc/mangohud/MangoHud.conf.example + /usr/bin/install -Dvm644 ./build/release/usr/share/MangoHud/icons/forkawesome-webfont.ttf /usr/share/MangoHud/icons/forkawesome-webfont.ttf /usr/bin/install -vm755 ./build/release/usr/bin/mangohud /usr/bin/mangohud # FIXME get the triplet somehow diff --git a/icons/forkawesome-webfont.ttf b/data/forkawesome-webfont.ttf similarity index 100% rename from icons/forkawesome-webfont.ttf rename to data/forkawesome-webfont.ttf diff --git a/src/font.cpp b/src/font.cpp index ddd1c149..f9dcd7e9 100644 --- a/src/font.cpp +++ b/src/font.cpp @@ -61,7 +61,7 @@ void create_fonts(const overlay_params& params, ImFont*& small_font, ImFont*& te config.MergeMode = true; config.GlyphMinAdvanceX = 13.0f; static const ImWchar icon_ranges[] = { ICON_MIN_FK, ICON_MAX_FK, 0 }; - io.Fonts->AddFontFromFileTTF("icons/forkawesome-webfont.ttf", 13.0f, &config, icon_ranges); + io.Fonts->AddFontFromFileTTF("/usr/share/MangoHud/icons/forkawesome-webfont.ttf", 13.0f, &config, icon_ranges); if (params.no_small_font) small_font = io.Fonts->Fonts[0]; @@ -75,7 +75,7 @@ void create_fonts(const overlay_params& params, ImFont*& small_font, ImFont*& te config.MergeMode = true; config.GlyphMinAdvanceX = 13.0f; static const ImWchar icon_ranges[] = { ICON_MIN_FK, ICON_MAX_FK, 0 }; - io.Fonts->AddFontFromFileTTF("icons/forkawesome-webfont.ttf", 13.0f, &config, icon_ranges); + io.Fonts->AddFontFromFileTTF("/usr/share/MangoHud/icons/forkawesome-webfont.ttf", 13.0f, &config, icon_ranges); if (params.no_small_font) small_font = io.Fonts->Fonts[0]; diff --git a/src/meson.build b/src/meson.build index 6fd11df1..af1db522 100644 --- a/src/meson.build +++ b/src/meson.build @@ -224,7 +224,9 @@ configure_file(input : '../bin/mangohud.in', configuration : conf_data, install_dir : get_option('bindir'), ) - +install_data(['../data/forkawesome-webfont.ttf'], + install_dir : join_paths(get_option('datadir'), 'MangoHud', 'icons'), +) if get_option('include_doc') install_data( files('../bin/MangoHud.conf'),