From b410bee3a45052cdf118a00939fd161279c415a8 Mon Sep 17 00:00:00 2001 From: Andreas Brachold Date: Sun, 10 Jun 2007 19:02:38 +0000 Subject: - for build now 'pkg-config' needed - Use swscale to converting image --- Makefile | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 368b854..856b298 100644 --- a/Makefile +++ b/Makefile @@ -31,6 +31,7 @@ CXX ?= g++ CXXFLAGS ?= -fPIC -O2 -Wall -Woverloaded-virtual +PKG-CONFIG ?= pkg-config ############################################### ############################################### @@ -86,26 +87,26 @@ LIBS += liboutput/liboutput.a libimage/libimage.a INCLUDES += -I$(VDRDIR)/include -I. ifdef FFMDIR -INCLUDES += -I$(FFMDIR)/libavcodec -I$(FFMDIR)/libavutil -LIBS += -L$(FFMDIR)/libavcodec +DEFINES += -DFFMDIR +LIBS += -L$(FFMDIR)/libavcodec -lavcodec -lz ifeq ($(LIBAVCODECVERSION),51) LIBS += -L$(FFMDIR)/libavformat -L$(FFMDIR)/libavutil LIBS += -lavformat -lavutil endif -endif - -LIBS += -lavcodec -LIBS += -lz - -ifdef FFMDIR -DEFINES += -DFFMDIR +else + LIBS += $(shell $(PKG-CONFIG) --libs libavcodec) endif ifndef WITHOUT_LIBEXIF - LIBS += -lexif + INCLUDES += $(shell $(PKG-CONFIG) --cflags libexif) + LIBS += $(shell $(PKG-CONFIG) --libs libexif) DEFINES += -DHAVE_LIBEXIF endif +ifndef WITHOUT_SWSCALER + LIBS += $(shell $(PKG-CONFIG) --libs libswscale) +endif + ### The object files (add further files here): OBJS = ${PLUGIN}.o i18n.o data.o menu.o data-image.o menu-image.o \ -- cgit v1.2.3