1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
|
diff --git a/domino-chain/Makefile b/domino-chain/Makefile
index 5ff0297..7f5354b 100644
--- a/domino-chain/Makefile
+++ b/domino-chain/Makefile
@@ -182,14 +182,10 @@ _tmp/po/leveltexts.cpp: src/levels/*/*.level
@mkdir -p $(dir $@)
sed -n '/^\(Description\|Hint\|Name\|Tutorial\)$$/,/^[^|]/ s,^| \(.*\)$$,_("\1"),p' src/levels/*/*.level | LC_ALL=C sort -u >$@
-FILES_DATADIR_SYS += data/fonts/FreeSans.ttf
-data/fonts/FreeSans.ttf:
+FILES_DATADIR_SYS += data/fonts/FreeSans.otf
+data/fonts/FreeSans.otf:
@mkdir -p $(dir $@)
- if [ -e /usr/share/fonts/truetype/freefont/FreeSans.ttf ]; then cp /usr/share/fonts/truetype/freefont/$(notdir $@) $@; \
- elif [ -e /usr/share/fonts/FreeSans.ttf ]; then cp /usr/share/fonts/$(notdir $@) $@; \
- elif [ -e /usr/share/fonts/freefont/FreeSans.ttf ]; then cp /usr/share/fonts/freefont/$(notdir $@) $@; \
- else echo 'Unable to find $(notdir $@)'; exit 1; \
- fi
+ cp /usr/share/fonts/gnu-free/$(notdir $@) $@
.PHONY: all
all: README.md AUTHORS $(FILES_BINDIR) $(FILES_DATADIR) $(FILES_DATADIR_SYS)
diff --git a/domino-chain/src/domino-chain/screen.cpp b/domino-chain/src/domino-chain/screen.cpp
index fa5bcf7..1e41869 100644
--- a/domino-chain/src/domino-chain/screen.cpp
+++ b/domino-chain/src/domino-chain/screen.cpp
@@ -691,7 +691,7 @@ void initText(void)
//the first, making English text legible, but if that font doesn't contains characters
//you need, you can add them. ATTENTION: do not enter spaces, example for japanese
// "FreeSans.ttf;DroidSansJapanese.ttf"
- std::vector<std::string> fontList = splitString(_("FreeSans.ttf"), ";");
+ std::vector<std::string> fontList = splitString(_("FreeSans.otf"), ";");
if (TTF_Init() == -1) {
std::cout << "Can't initialize font engine" << std::endl;
|