1
0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00

The include path to the freetype2 header files is now retrieved via a call to 'pkg-config --cflags freetype2'

This commit is contained in:
Klaus Schmidinger 2010-12-29 11:35:40 +01:00
parent 9f60bd2fc4
commit 343071cc6a
3 changed files with 9 additions and 3 deletions

View File

@ -2646,3 +2646,7 @@ Dominik Strasser <dominik@die-strassers.de>
Joerg Bornkessel <hd_brummy@gentoo.org> Joerg Bornkessel <hd_brummy@gentoo.org>
for adding LDFLAGS to the linker calls in the Makefiles 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'

View File

@ -6481,7 +6481,7 @@ Video Disk Recorder Revision History
from Osama Alrawab). See INSTALL for information on how to turn this on. from Osama Alrawab). See INSTALL for information on how to turn this on.
- Added Arabian language texts (thanks to Osama Alrawab). - 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). - Updated the Estonian OSD texts (thanks to Arthur Konovalov).
- Fixed following symbolic links in RemoveFileOrDir() (cont'd) (thanks to - Fixed following symbolic links in RemoveFileOrDir() (cont'd) (thanks to
@ -6517,3 +6517,5 @@ Video Disk Recorder Revision History
Paul Menzel). Paul Menzel).
- Now updating the 'frames per second' data in the list of recordings when a new - 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. 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).

View File

@ -4,7 +4,7 @@
# See the main source file 'vdr.c' for copyright information and # See the main source file 'vdr.c' for copyright information and
# how to reach the author. # 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: .DELETE_ON_ERROR:
@ -21,7 +21,7 @@ MANDIR = $(PREFIX)/share/man
BINDIR = $(PREFIX)/bin BINDIR = $(PREFIX)/bin
LOCDIR = ./locale LOCDIR = ./locale
LIBS = -ljpeg -lpthread -ldl -lcap -lrt -lfreetype -lfontconfig LIBS = -ljpeg -lpthread -ldl -lcap -lrt -lfreetype -lfontconfig
INCLUDES ?= -I/usr/include/freetype2 INCLUDES ?= $(shell pkg-config --cflags freetype2)
PLUGINDIR= ./PLUGINS PLUGINDIR= ./PLUGINS
PLUGINLIBDIR= $(PLUGINDIR)/lib PLUGINLIBDIR= $(PLUGINDIR)/lib