summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorAndreas Brachold <vdr07@deltab.de>2005-07-19 15:36:03 +0000
committerAndreas Brachold <vdr07@deltab.de>2005-07-19 15:36:03 +0000
commitb8671ccffc526763a64d7f7614dd8ba66e6fb540 (patch)
tree7bfb52099e19383fb1d4117a08b738f9a60e07c0 /Makefile
parentf897f2aa7055c493db6391c50c8d19da970078e8 (diff)
downloadvdr-plugin-image-b8671ccffc526763a64d7f7614dd8ba66e6fb540.tar.gz
vdr-plugin-image-b8671ccffc526763a64d7f7614dd8ba66e6fb540.tar.bz2
- add alternative script (scripts/maverickplugin.sh) for image converting with imagemagick
- adjust encoding parameter for new ffmpeg-releases, downwards compatible - remove linking with dlfcn at runtime of libavcodec.so, now are linked at compiled time - some code refactoring, to enhance readability
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile14
1 files changed, 2 insertions, 12 deletions
diff --git a/Makefile b/Makefile
index 24b86d4..28c7a71 100644
--- a/Makefile
+++ b/Makefile
@@ -41,20 +41,10 @@ PACKAGE = vdr-$(ARCHIVE)
### Includes and Defines (add further entries here):
-INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include -I.
+INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include -I. -I$(FFMDIR)
DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
DEFINES += -D_GNU_SOURCE
-
-
-LIBS += liboutput/liboutput.a libimage/libimage.a
-
-ifdef FFMPEG_STATIC
- INCLUDES += -I$(FFMDIR)
- DEFINES += -DHAVE_FFMPEG_STATIC
- LIBS += -L$(FFMDIR)/libavcodec -lavcodec -lz
-else
- LIBS += -ldl -rdynamic
-endif
+LIBS += liboutput/liboutput.a libimage/libimage.a -L$(FFMDIR)/libavcodec -lavcodec -lz
### The object files (add further files here):