frodovdr
/
vdr
mirror of https://github.com/VDR4Arch/vdr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Now using pkg-config to get fribidi, freetype and fontconfig cflags and libs

This commit is contained in:
Klaus Schmidinger 2011-04-17 13:29:42 +02:00
parent e33a38a542
commit bcdd5cb886
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CONTRIBUTORS
View File

@ -1892,7 +1892,7 @@ Ville Skytt
for making 'dist' target dependent on up to date *.po
for adding Language and fixing Language-Team header of *.po
for fixing the Language header of the Serbian translation file
for using pkg-config to get fribidi cflags and libs
for using pkg-config to get fribidi, freetype and fontconfig cflags and libs
Steffen Beyer <cpunk@reactor.de>
for fixing setting the colored button help after deleting a recording in case the next

3
HISTORY
View File

@ -6600,4 +6600,5 @@ Video Disk Recorder Revision History
Andreas Regel).
- Removed an obsolete local variable in dvbsdffosd.c (thanks to Paul Menzel).
- Fixed a possible NULL pointer dereference in osddemo.c (reported by Paul Menzel).
- Now using pkg-config to get fribidi cflags and libs (thanks to Ville Skyttä).
- Now using pkg-config to get fribidi, freetype and fontconfig cflags and libs (thanks
to Ville Skyttä).

6
Makefile
View File

@ -4,7 +4,7 @@
# See the main source file 'vdr.c' for copyright information and
# how to reach the author.
#
# $Id: Makefile 2.15 2011/04/17 13:26:02 kls Exp $
# $Id: Makefile 2.16 2011/04/17 13:29:01 kls Exp $
.DELETE_ON_ERROR:
@ -20,8 +20,8 @@ PREFIX ?= /usr/local
MANDIR = $(PREFIX)/share/man
BINDIR = $(PREFIX)/bin
LOCDIR = ./locale
LIBS = -ljpeg -lpthread -ldl -lcap -lrt -lfreetype -lfontconfig
INCLUDES ?= $(shell pkg-config --cflags freetype2)
LIBS = -ljpeg -lpthread -ldl -lcap -lrt $(shell pkg-config --libs freetype2 fontconfig)
INCLUDES ?= $(shell pkg-config --cflags freetype2 fontconfig)
PLUGINDIR= ./PLUGINS
PLUGINLIBDIR= $(PLUGINDIR)/lib