From c94570e69dfca940ba04829debb93e421f77c4f0 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Fri, 24 Oct 2003 12:53:12 +0200 Subject: Changed font handling to allow language specific character sets; adopted the small font character set from the "Elchi" patch --- Makefile | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 1c009e83..7662ec39 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ # See the main source file 'vdr.c' for copyright information and # how to reach the author. # -# $Id: Makefile 1.58 2003/08/09 11:09:45 kls Exp $ +# $Id: Makefile 1.59 2003/10/24 12:53:12 kls Exp $ .DELETE_ON_ERROR: @@ -39,8 +39,9 @@ OBJS = audio.o channels.o ci.o config.o cutter.o device.o diseqc.o dvbdevice.o d receiver.o recorder.o recording.o remote.o remux.o ringbuffer.o sources.o\ spu.o status.o svdrp.o thread.o timers.o tools.o transfer.o vdr.o videodir.o -OSDFONT = -adobe-helvetica-medium-r-normal--23-*-100-100-p-*-iso8859-1 -FIXFONT = -adobe-courier-bold-r-normal--25-*-100-100-m-*-iso8859-1 +FIXFONT_ISO8859_1 = -adobe-courier-bold-r-normal--25-*-100-100-m-*-iso8859-1 +OSDFONT_ISO8859_1 = -adobe-helvetica-medium-r-normal--23-*-100-100-p-*-iso8859-1 +SMLFONT_ISO8859_1 = -adobe-helvetica-medium-r-normal--18-*-100-100-p-*-iso8859-1 ifndef NO_KBD DEFINES += -DREMOTE_KBD @@ -64,7 +65,7 @@ DEFINES += -DVFAT endif all: vdr -font: genfontfile fontfix.c fontosd.c +font: genfontfile fontfix.c fontosd.c fontsml.c @echo "font files created." # Implicit rules: @@ -89,9 +90,11 @@ vdr: $(OBJS) $(DTVLIB) # The font files: fontfix.c: - ./genfontfile "cFont::tPixelData FontFix" "$(FIXFONT)" > $@ + ./genfontfile "cFont::tPixelData FontFix_iso8859_1" "$(FIXFONT_ISO8859_1)" > $@ fontosd.c: - ./genfontfile "cFont::tPixelData FontOsd" "$(OSDFONT)" > $@ + ./genfontfile "cFont::tPixelData FontOsd_iso8859_1" "$(OSDFONT_ISO8859_1)" > $@ +fontsml.c: + ./genfontfile "cFont::tPixelData FontSml_iso8859_1" "$(SMLFONT_ISO8859_1)" > $@ # The font file generator: @@ -145,6 +148,6 @@ clean: -rm -rf include -rm -rf srcdoc fontclean: - -rm -f fontfix.c fontosd.c + -rm -f fontfix.c fontosd.c fontsml.c CLEAN: clean fontclean -- cgit v1.2.3