diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | data/Makefile.am | 2 | ||||
| -rw-r--r-- | data/fonts/Makefile.am | 5 | ||||
| -rw-r--r-- | src/gui/gui.cpp | 4 |
4 files changed, 10 insertions, 3 deletions
@@ -2,6 +2,8 @@ * src/main.cpp: Added --data parameter to be used to specify where to get the data from when using --skipupdate. + * configure.ac, data/Makefile.am, data/fonts/Makefile.am: Fixed + installing of dejavusans.ttf font. 2008-04-19 Yohann Ferreira <bertram@cegetel.net> diff --git a/data/Makefile.am b/data/Makefile.am index 5a28f7c1..62672207 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = graphics help icons +SUBDIRS = fonts graphics help icons tmwdatadir = $(pkgdatadir)/data diff --git a/data/fonts/Makefile.am b/data/fonts/Makefile.am new file mode 100644 index 00000000..331f6c8b --- /dev/null +++ b/data/fonts/Makefile.am @@ -0,0 +1,5 @@ +fontsdir = $(pkgdatadir)/data/fonts + +fonts_DATA = dejavusans.ttf + +EXTRA_DIST = $(fonts_DATA) diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index db0d1905..d9c8f1ce 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -111,14 +111,14 @@ Gui::Gui(Graphics *graphics): // Set global font std::string path = resman->getPath("fonts/dejavusans.ttf"); - if (path != "") + if (!path.empty()) { mGuiFont = new TrueTypeFont(path.c_str(), 11); } // Set speech font path = resman->getPath("fonts/dejavusans.ttf"); - if (path != "") + if (!path.empty()) { speechFont = new TrueTypeFont(path.c_str(), 11); } |