fonts: Store the generated TrueType fonts in the repository, and rebuild them only in maintainer mode.
diff --git a/Make.rules.in b/Make.rules.in
index 78105d3..84842d4 100644
--- a/Make.rules.in
+++ b/Make.rules.in
@@ -127,7 +127,7 @@
# Implicit rules
-.SUFFIXES: .mc .rc .mc.rc .res .res.o .spec .spec.o .idl .tlb .h .y .l .tab.c .tab.h .yy.c .ok .sfd .ttf .man.in .man _c.c _i.c _p.c _s.c @MAINTAINER_MODE@ .svg .ico
+.SUFFIXES: .mc .rc .mc.rc .res .res.o .spec .spec.o .idl .tlb .h .y .l .tab.c .tab.h .yy.c .ok .man.in .man _c.c _i.c _p.c _s.c @MAINTAINER_MODE@ .sfd .ttf .svg .ico
.c.o:
$(CC) -c $(ALLCFLAGS) -o $@ $<
diff --git a/configure b/configure
index 51a9fd0..97bbca0 100755
--- a/configure
+++ b/configure
@@ -6443,6 +6443,7 @@
if test "${enable_maintainer_mode+set}" = set
then
+ if test "$FONTFORGE" = "false"; then wine_warnings="$wine_warnings|fontforge is missing, fonts can't be rebuilt."; fi
if test "$RSVG" = "false"; then wine_warnings="$wine_warnings|rsvg is missing, icons can't be rebuilt."; fi
if test "$ICOTOOL" = "false"; then wine_warnings="$wine_warnings|icotool is missing, icons can't be rebuilt."; fi
fi
@@ -14009,11 +14010,7 @@
fi
fi
-if test "$FONTFORGE" = "false"
-then
- wine_warnings="$wine_warnings|FontForge is missing.
-Fonts will not be built. Dialog text may be invisible or unaligned."
-elif test "x$FREETYPELIBS" = "x"
+if test "x$FREETYPELIBS" = "x"
then
wine_warnings="$wine_warnings|FreeType development files not found.
Fonts will not be built. Dialog text may be invisible or unaligned."
diff --git a/configure.ac b/configure.ac
index 89ec3a2..f1ae3cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -193,6 +193,7 @@
if test "${enable_maintainer_mode+set}" = set
then
+ if test "$FONTFORGE" = "false"; then WINE_WARNING([fontforge is missing, fonts can't be rebuilt.]); fi
if test "$RSVG" = "false"; then WINE_WARNING([rsvg is missing, icons can't be rebuilt.]); fi
if test "$ICOTOOL" = "false"; then WINE_WARNING([icotool is missing, icons can't be rebuilt.]); fi
fi
@@ -1002,12 +1003,8 @@
fi
fi
-dnl Only build the fonts dir if we have both freetype and fontforge
-if test "$FONTFORGE" = "false"
-then
- WINE_WARNING([FontForge is missing.
-Fonts will not be built. Dialog text may be invisible or unaligned.])
-elif test "x$FREETYPELIBS" = "x"
+dnl Only build the fonts dir if we have freetype
+if test "x$FREETYPELIBS" = "x"
then
WINE_WARNING([FreeType development files not found.
Fonts will not be built. Dialog text may be invisible or unaligned.])
diff --git a/fonts/.gitignore b/fonts/.gitignore
index 978a367..a857f0d 100644
--- a/fonts/.gitignore
+++ b/fonts/.gitignore
@@ -6,18 +6,13 @@
/coureg.fon
/courer.fon
/couret.fon
-/courier.ttf
/cvgasys.fon
/hvgasys.fon
/jsmalle.fon
/jvgasys.fon
-/marlett.ttf
-/ms_sans_serif.ttf
/smae1255.fon
/smae1256.fon
/smae1257.fon
-/small_fonts.ttf
-/small_fonts_jp.ttf
/smalle.fon
/smallee.fon
/smalleg.fon
@@ -33,9 +28,6 @@
/sserifer.fon
/sserifet.fon
/svgasys.fon
-/system.ttf
-/tahoma.ttf
-/tahomabd.ttf
/vgas1255.fon
/vgas1256.fon
/vgas1257.fon
diff --git a/fonts/Makefile.in b/fonts/Makefile.in
index bc307f5..60353f8 100644
--- a/fonts/Makefile.in
+++ b/fonts/Makefile.in
@@ -54,137 +54,138 @@
FONTS = \
$(BITMAP_FONTS) \
- $(TRUETYPE_FONTS)
+ $(TRUETYPE_FONTS:%=$(SRCDIR)/%)
all: $(FONTS)
@MAKE_RULES@
coure.fon: courier.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 128 courier.ttf 13,1252,8
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/courier.ttf 13,1252,8
couree.fon: courier.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 128 courier.ttf 13,1250,8
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/courier.ttf 13,1250,8
courer.fon: courier.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 128 courier.ttf 13,1251,8
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/courier.ttf 13,1251,8
coureg.fon: courier.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 128 courier.ttf 13,1253,8
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/courier.ttf 13,1253,8
couret.fon: courier.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 128 courier.ttf 13,1254,8
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/courier.ttf 13,1254,8
coue1255.fon: courier.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 128 courier.ttf 13,1255,8
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/courier.ttf 13,1255,8
coue1256.fon: courier.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 128 courier.ttf 13,1256,8
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/courier.ttf 13,1256,8
coue1257.fon: courier.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 128 courier.ttf 13,1257,8
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/courier.ttf 13,1257,8
sserife.fon: ms_sans_serif.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 129 ms_sans_serif.ttf 13,1252,5 16,1252,7 20,1252,8
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(SRCDIR)/ms_sans_serif.ttf 13,1252,5 16,1252,7 20,1252,8
sserifee.fon: ms_sans_serif.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 129 ms_sans_serif.ttf 13,1250,5 16,1250,7
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(SRCDIR)/ms_sans_serif.ttf 13,1250,5 16,1250,7
sserifer.fon: ms_sans_serif.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 129 ms_sans_serif.ttf 13,1251,5 16,1251,7 20,1251,8
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(SRCDIR)/ms_sans_serif.ttf 13,1251,5 16,1251,7 20,1251,8
sserifeg.fon: ms_sans_serif.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 129 ms_sans_serif.ttf 13,1253,5 16,1253,7 20,1253,8
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(SRCDIR)/ms_sans_serif.ttf 13,1253,5 16,1253,7 20,1253,8
sserifet.fon: ms_sans_serif.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 129 ms_sans_serif.ttf 13,1254,5 16,1254,7 20,1254,8
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(SRCDIR)/ms_sans_serif.ttf 13,1254,5 16,1254,7 20,1254,8
ssee1255.fon: ms_sans_serif.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 129 ms_sans_serif.ttf 13,1255,5 16,1255,7 20,1255,8
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(SRCDIR)/ms_sans_serif.ttf 13,1255,5 16,1255,7 20,1255,8
ssee1256.fon: ms_sans_serif.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 129 ms_sans_serif.ttf 13,1256,5 16,1256,7 20,1256,8
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(SRCDIR)/ms_sans_serif.ttf 13,1256,5 16,1256,7 20,1256,8
ssee1257.fon: ms_sans_serif.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 129 ms_sans_serif.ttf 13,1257,5 16,1257,7 20,1257,8
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(SRCDIR)/ms_sans_serif.ttf 13,1257,5 16,1257,7 20,1257,8
ssee874.fon: ms_sans_serif.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 129 ms_sans_serif.ttf 13,874,5 16,874,7 20,874,8
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(SRCDIR)/ms_sans_serif.ttf 13,874,5 16,874,7 20,874,8
smalle.fon: small_fonts.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 128 small_fonts.ttf 11,1252,5
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/small_fonts.ttf 11,1252,5
smallee.fon: small_fonts.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 128 small_fonts.ttf 11,1250,5
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/small_fonts.ttf 11,1250,5
smaller.fon: small_fonts.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 128 small_fonts.ttf 11,1251,5
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/small_fonts.ttf 11,1251,5
smalleg.fon: small_fonts.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 128 small_fonts.ttf 11,1253,5
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/small_fonts.ttf 11,1253,5
smallet.fon: small_fonts.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 128 small_fonts.ttf 11,1254,5
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/small_fonts.ttf 11,1254,5
smae1255.fon: small_fonts.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 128 small_fonts.ttf 11,1255,5
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/small_fonts.ttf 11,1255,5
smae1256.fon: small_fonts.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 128 small_fonts.ttf 11,1256,5
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/small_fonts.ttf 11,1256,5
smae1257.fon: small_fonts.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 128 small_fonts.ttf 11,1257,5
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/small_fonts.ttf 11,1257,5
jsmalle.fon: small_fonts_jp.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 128 small_fonts_jp.ttf 11,932,7
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/small_fonts_jp.ttf 11,932,7
vgasys.fon: system.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 128 system.ttf 16,1252,7
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/system.ttf 16,1252,7
vgasyse.fon: system.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 128 system.ttf 16,1250,7
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/system.ttf 16,1250,7
vgasysr.fon: system.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 128 system.ttf 16,1251,7
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/system.ttf 16,1251,7
vgasysg.fon: system.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 128 system.ttf 16,1253,7
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/system.ttf 16,1253,7
vgasyst.fon: system.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 128 system.ttf 16,1254,7
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/system.ttf 16,1254,7
vgas1255.fon: system.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 128 system.ttf 16,1255,7
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/system.ttf 16,1255,7
vgas1256.fon: system.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 128 system.ttf 16,1256,7
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/system.ttf 16,1256,7
vgas1257.fon: system.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 128 system.ttf 16,1257,7
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/system.ttf 16,1257,7
vgas874.fon: system.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 128 system.ttf 16,874,7
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/system.ttf 16,874,7
jvgasys.fon: system.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 128 system.ttf 18,932,8
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/system.ttf 18,932,8
svgasys.fon: system.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 128 system.ttf 16,936,7 16,1252,7
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/system.ttf 16,936,7 16,1252,7
hvgasys.fon: system.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 128 system.ttf 16,949,7
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/system.ttf 16,949,7
cvgasys.fon: system.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 128 system.ttf 16,950,7 16,1252,7
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/system.ttf 16,950,7 16,1252,7
$(BITMAP_FONTS): $(SFNT2FNT)
install:: $(FONTS) $(INSTALLDIRS)
- for i in $(FONTS); do $(INSTALL_DATA) $$i $(DESTDIR)$(fontdir)/$$i || exit 1; done
+ for i in $(BITMAP_FONTS); do $(INSTALL_DATA) $$i $(DESTDIR)$(fontdir)/$$i || exit 1; done
+ for i in $(TRUETYPE_FONTS); do $(INSTALL_DATA) $(SRCDIR)/$$i $(DESTDIR)$(fontdir)/$$i || exit 1; done
uninstall::
-cd $(DESTDIR)$(fontdir) && $(RM) $(FONTS)
-rmdir $(DESTDIR)$(fontdir)
clean::
- $(RM) *.fon *.ttf
+ $(RM) $(BITMAP_FONTS)
diff --git a/fonts/courier.ttf b/fonts/courier.ttf
new file mode 100644
index 0000000..80217cf
--- /dev/null
+++ b/fonts/courier.ttf
Binary files differ
diff --git a/fonts/marlett.ttf b/fonts/marlett.ttf
new file mode 100644
index 0000000..2231efb
--- /dev/null
+++ b/fonts/marlett.ttf
Binary files differ
diff --git a/fonts/ms_sans_serif.ttf b/fonts/ms_sans_serif.ttf
new file mode 100644
index 0000000..b3d2dfd
--- /dev/null
+++ b/fonts/ms_sans_serif.ttf
Binary files differ
diff --git a/fonts/small_fonts.ttf b/fonts/small_fonts.ttf
new file mode 100644
index 0000000..6fe98a4
--- /dev/null
+++ b/fonts/small_fonts.ttf
Binary files differ
diff --git a/fonts/small_fonts_jp.ttf b/fonts/small_fonts_jp.ttf
new file mode 100644
index 0000000..f07e4a1
--- /dev/null
+++ b/fonts/small_fonts_jp.ttf
Binary files differ
diff --git a/fonts/system.ttf b/fonts/system.ttf
new file mode 100644
index 0000000..437d367
--- /dev/null
+++ b/fonts/system.ttf
Binary files differ
diff --git a/fonts/tahoma.ttf b/fonts/tahoma.ttf
new file mode 100644
index 0000000..76526b0
--- /dev/null
+++ b/fonts/tahoma.ttf
Binary files differ
diff --git a/fonts/tahomabd.ttf b/fonts/tahomabd.ttf
new file mode 100644
index 0000000..021102a
--- /dev/null
+++ b/fonts/tahomabd.ttf
Binary files differ
