Skip to content

W
wine-cw
Commit 8ad6049a authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

fonts: Store the generated TrueType fonts in the repository, and rebuild them…

fonts: Store the generated TrueType fonts in the repository, and rebuild them only in maintainer mode.
parent f2734a1a
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 62 deletions
Make.rules.in
View file @ 8ad6049a
...@@ -127,7 +127,7 @@ LINTS = $(C_SRCS:.c=.ln) ...@@ -127,7 +127,7 @@ LINTS = $(C_SRCS:.c=.ln)
# Implicit rules # 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: .c.o:
$(CC) -c $(ALLCFLAGS) -o $@ $< $(CC) -c $(ALLCFLAGS) -o $@ $<
......
configure
View file @ 8ad6049a
...@@ -6443,6 +6443,7 @@ test -n "$ICOTOOL" || ICOTOOL="false" ...@@ -6443,6 +6443,7 @@ test -n "$ICOTOOL" || ICOTOOL="false"
if test "${enable_maintainer_mode+set}" = set if test "${enable_maintainer_mode+set}" = set
then 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 "$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 if test "$ICOTOOL" = "false"; then wine_warnings="$wine_warnings|icotool is missing, icons can't be rebuilt."; fi
fi fi
...@@ -14009,11 +14010,7 @@ _ACEOF ...@@ -14009,11 +14010,7 @@ _ACEOF
fi fi
fi fi
if test "$FONTFORGE" = "false" if test "x$FREETYPELIBS" = "x"
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"
then then
wine_warnings="$wine_warnings|FreeType development files not found. wine_warnings="$wine_warnings|FreeType development files not found.
Fonts will not be built. Dialog text may be invisible or unaligned." Fonts will not be built. Dialog text may be invisible or unaligned."
......
configure.ac
View file @ 8ad6049a
...@@ -193,6 +193,7 @@ AC_CHECK_PROGS(ICOTOOL, icotool, false) ...@@ -193,6 +193,7 @@ AC_CHECK_PROGS(ICOTOOL, icotool, false)
if test "${enable_maintainer_mode+set}" = set if test "${enable_maintainer_mode+set}" = set
then 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 "$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 if test "$ICOTOOL" = "false"; then WINE_WARNING([icotool is missing, icons can't be rebuilt.]); fi
fi fi
...@@ -1002,12 +1003,8 @@ then ...@@ -1002,12 +1003,8 @@ then
fi fi
fi fi
dnl Only build the fonts dir if we have both freetype and fontforge dnl Only build the fonts dir if we have freetype
if test "$FONTFORGE" = "false" if test "x$FREETYPELIBS" = "x"
then
WINE_WARNING([FontForge is missing.
Fonts will not be built. Dialog text may be invisible or unaligned.])
elif test "x$FREETYPELIBS" = "x"
then then
WINE_WARNING([FreeType development files not found. WINE_WARNING([FreeType development files not found.
Fonts will not be built. Dialog text may be invisible or unaligned.]) Fonts will not be built. Dialog text may be invisible or unaligned.])
......
fonts/.gitignore
View file @ 8ad6049a
...@@ -6,18 +6,13 @@ ...@@ -6,18 +6,13 @@
/coureg.fon /coureg.fon
/courer.fon /courer.fon
/couret.fon /couret.fon
/courier.ttf
/cvgasys.fon /cvgasys.fon
/hvgasys.fon /hvgasys.fon
/jsmalle.fon /jsmalle.fon
/jvgasys.fon /jvgasys.fon
/marlett.ttf
/ms_sans_serif.ttf
/smae1255.fon /smae1255.fon
/smae1256.fon /smae1256.fon
/smae1257.fon /smae1257.fon
/small_fonts.ttf
/small_fonts_jp.ttf
/smalle.fon /smalle.fon
/smallee.fon /smallee.fon
/smalleg.fon /smalleg.fon
...@@ -33,9 +28,6 @@ ...@@ -33,9 +28,6 @@
/sserifer.fon /sserifer.fon
/sserifet.fon /sserifet.fon
/svgasys.fon /svgasys.fon
/system.ttf
/tahoma.ttf
/tahomabd.ttf
/vgas1255.fon /vgas1255.fon
/vgas1256.fon /vgas1256.fon
/vgas1257.fon /vgas1257.fon
......
fonts/Makefile.in
View file @ 8ad6049a
...@@ -54,137 +54,138 @@ TRUETYPE_FONTS = \ ...@@ -54,137 +54,138 @@ TRUETYPE_FONTS = \
FONTS = \ FONTS = \
$(BITMAP_FONTS) \ $(BITMAP_FONTS) \
$(TRUETYPE_FONTS) $(TRUETYPE_FONTS:%=$(SRCDIR)/%)
all: $(FONTS) all: $(FONTS)
@MAKE_RULES@ @MAKE_RULES@
coure.fon: courier.ttf 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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) $(BITMAP_FONTS): $(SFNT2FNT)
install:: $(FONTS) $(INSTALLDIRS) 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:: uninstall::
-cd $(DESTDIR)$(fontdir) && $(RM) $(FONTS) -cd $(DESTDIR)$(fontdir) && $(RM) $(FONTS)
-rmdir $(DESTDIR)$(fontdir) -rmdir $(DESTDIR)$(fontdir)
clean:: clean::
$(RM) *.fon *.ttf $(RM) $(BITMAP_FONTS)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment