summaryrefslogtreecommitdiff
path: root/liboutput
diff options
context:
space:
mode:
Diffstat (limited to 'liboutput')
-rw-r--r--liboutput/Makefile18
1 files changed, 14 insertions, 4 deletions
diff --git a/liboutput/Makefile b/liboutput/Makefile
index 7300393..0392ce4 100644
--- a/liboutput/Makefile
+++ b/liboutput/Makefile
@@ -20,17 +20,27 @@ INCLUDES += -I$(VDRDIR)/include -I.
ifdef FFMDIR
INCLUDES += -I$(FFMDIR)/libavcodec -I$(FFMDIR)/libavutil
DEFINES += -DFFMDIR
+ifndef WITHOUT_SWSCALER
+ DEFINES += -DHAVE_SWSCALER
+ INCLUDES += -I$(FFMDIR)/libswscale
+endif
else
- INCLUDES += $(shell $(PKG-CONFIG) --cflags libavcodec)
+
+ifndef WITHOUT_SWSCALER
+ DEFINES += -DHAVE_SWSCALER
+ PKG-INCLUDES += libswscale
+endif
+
+ PKG-INCLUDES += libavcodec
endif
DEFINES += -D_GNU_SOURCE
-ifndef WITHOUT_SWSCALER
- DEFINES += -DHAVE_SWSCALER
- INCLUDES += $(shell $(PKG-CONFIG) --cflags libswscale)
+ifdef PKG-INCLUDES
+INCLUDES += $(shell $(PKG-CONFIG) --cflags $(PKG-INCLUDES))
endif
+
### The object files (add further files here):
OBJS = encode.o stillimage.o stillimage-player.o