diff options
| author | Klaus Schmidinger <vdr@tvdr.de> | 2010-12-29 11:35:40 +0100 |
|---|---|---|
| committer | Klaus Schmidinger <vdr@tvdr.de> | 2010-12-29 11:35:40 +0100 |
| commit | 343071cc6ab69169312ae04a7888cd55a79395d0 (patch) | |
| tree | 0e5afec6f842e25c6acc7f55141e00ca38174c4b | |
| parent | 9f60bd2fc401c0d195e2a55f24e0e09ec17bb824 (diff) | |
| download | vdr-343071cc6ab69169312ae04a7888cd55a79395d0.tar.gz vdr-343071cc6ab69169312ae04a7888cd55a79395d0.tar.bz2 | |
The include path to the freetype2 header files is now retrieved via a call to 'pkg-config --cflags freetype2'
| -rw-r--r-- | CONTRIBUTORS | 4 | ||||
| -rw-r--r-- | HISTORY | 4 | ||||
| -rw-r--r-- | Makefile | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index c84a1e8d..fd06cd2a 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -2646,3 +2646,7 @@ Dominik Strasser <dominik@die-strassers.de> Joerg Bornkessel <hd_brummy@gentoo.org> for adding LDFLAGS to the linker calls in the Makefiles + +Andreas Oberritter <obi@opendreambox.org> + for suggesting to retrieve the include path to the freetype2 header files + via a call to 'pkg-config --cflags freetype2' @@ -6481,7 +6481,7 @@ Video Disk Recorder Revision History from Osama Alrawab). See INSTALL for information on how to turn this on. - Added Arabian language texts (thanks to Osama Alrawab). -2010-12-26: Version 1.7.17 +2010-12-29: Version 1.7.17 - Updated the Estonian OSD texts (thanks to Arthur Konovalov). - Fixed following symbolic links in RemoveFileOrDir() (cont'd) (thanks to @@ -6517,3 +6517,5 @@ Video Disk Recorder Revision History Paul Menzel). - Now updating the 'frames per second' data in the list of recordings when a new recording is started that has a frame rate other than the default. +- The include path to the freetype2 header files is now retrieved via a call to + 'pkg-config --cflags freetype2' (suggested by Andreas Oberritter). @@ -4,7 +4,7 @@ # See the main source file 'vdr.c' for copyright information and # how to reach the author. # -# $Id: Makefile 2.12 2010/12/26 12:04:17 kls Exp $ +# $Id: Makefile 2.13 2010/12/29 11:22:56 kls Exp $ .DELETE_ON_ERROR: @@ -21,7 +21,7 @@ MANDIR = $(PREFIX)/share/man BINDIR = $(PREFIX)/bin LOCDIR = ./locale LIBS = -ljpeg -lpthread -ldl -lcap -lrt -lfreetype -lfontconfig -INCLUDES ?= -I/usr/include/freetype2 +INCLUDES ?= $(shell pkg-config --cflags freetype2) PLUGINDIR= ./PLUGINS PLUGINLIBDIR= $(PLUGINDIR)/lib |