summaryrefslogtreecommitdiff
path: root/liboutput/Makefile
diff options
context:
space:
mode:
authorAndreas Brachold <vdr07@deltab.de>2005-10-22 09:52:40 +0000
committerAndreas Brachold <vdr07@deltab.de>2005-10-22 09:52:40 +0000
commit6c998839275531e0424160adf221be80b8eabe76 (patch)
treef011413b3ff087abbdc58cf02284f58b31740a8b /liboutput/Makefile
parentdb70850309c25cc0781b9bf1a164e11d94a02418 (diff)
downloadvdr-plugin-image-6c998839275531e0424160adf221be80b8eabe76.tar.gz
vdr-plugin-image-6c998839275531e0424160adf221be80b8eabe76.tar.bz2
* add FFMDIR to liboutput/Makefile, for build again ffmpeg directory
Diffstat (limited to 'liboutput/Makefile')
-rw-r--r--liboutput/Makefile12
1 files changed, 10 insertions, 2 deletions
diff --git a/liboutput/Makefile b/liboutput/Makefile
index 8c1a903..142e784 100644
--- a/liboutput/Makefile
+++ b/liboutput/Makefile
@@ -5,7 +5,7 @@
VDRDIR = ../../../..
DVBDIR = ../../../../../DVB
-FFMDIR = ../../../../../ffmpeg
+#FFMDIR = ../../../../../ffmpeg
### The C++ compiler and options:
@@ -17,9 +17,17 @@ CXXFLAGS ?= -O0 -g -Wall -Woverloaded-virtual
### The directory environment:
-INCLUDES += -I$(VDRDIR)/include -I. -I$(FFMDIR)
+INCLUDES += -I$(VDRDIR)/include -I.
+ifdef FFMDIR
+INCLUDES += -I$(FFMDIR)/libavcodec -I$(FFMDIR)/libavutil
+endif
+
DEFINES += -D_GNU_SOURCE
+ifdef FFMDIR
+DEFINES += -DFFMDIR
+endif
+
### The object files (add further files here):
OBJS = encode.o stillimage.o stillimage-player.o