diff options
| -rw-r--r-- | Makefile | 10 | ||||
| -rwxr-xr-x | configure | 5 |
2 files changed, 8 insertions, 7 deletions
@@ -4,7 +4,7 @@ # See the main source file 'xineliboutput.c' for copyright information and # how to reach the author. # -# $Id: Makefile,v 1.88 2010-03-07 17:27:14 rofafor Exp $ +# $Id: Makefile,v 1.89 2010-05-25 12:28:13 phintuka Exp $ # # The official name of this plugin. @@ -335,22 +335,22 @@ $(VDRPLUGIN): $(OBJS) $(OBJS_MPG) # $(VDRPLUGIN_SXFE): $(OBJS_SXFE_SO) - $(CC) $(CFLAGS) $(LDFLAGS_SO) $(OBJS_SXFE_SO) $(LIBS_X11) $(LIBS_XINE) -o $@ + $(CC) $(CFLAGS) $(LDFLAGS_SO) $(OBJS_SXFE_SO) $(LIBS_X11) $(LIBS_XINE) $(LIBS_JPEG) -o $@ @-rm -rf $(LIBDIR)/$(VDRPLUGIN_SXFE).$(VERSION) @cp $@ $(LIBDIR)/$(VDRPLUGIN_SXFE).$(VERSION) $(VDRSXFE): $(OBJS_SXFE) - $(CC) -g $(OBJS_SXFE) $(LIBS_X11) $(LIBS_XINE) -o $@ + $(CC) -g $(OBJS_SXFE) $(LIBS_X11) $(LIBS_XINE) $(LIBS_JPEG) -o $@ # # vdr-fbfe # $(VDRPLUGIN_FBFE): $(OBJS_FBFE_SO) - $(CC) $(CFLAGS) $(LDFLAGS_SO) $(OBJS_FBFE_SO) $(LIBS_XINE) -o $@ + $(CC) $(CFLAGS) $(LDFLAGS_SO) $(OBJS_FBFE_SO) $(LIBS_XINE) $(LIBS_JPEG) -o $@ @-rm -rf $(LIBDIR)/$(VDRPLUGIN_FBFE).$(VERSION) @cp $@ $(LIBDIR)/$(VDRPLUGIN_FBFE).$(VERSION) $(VDRFBFE): $(OBJS_FBFE) - $(CC) -g $(OBJS_FBFE) $(LIBS_XINE) -o $@ + $(CC) -g $(OBJS_FBFE) $(LIBS_XINE) $(LIBS_JPEG) -o $@ # # xine plugins @@ -7,7 +7,7 @@ # See the main source file 'xineliboutput.c' for copyright information and # how to reach the author. # -# * $Id: configure,v 1.22 2010-05-19 12:42:42 phintuka Exp $ +# * $Id: configure,v 1.23 2010-05-25 12:28:13 phintuka Exp $ # PKG_CONFIG="pkg-config" @@ -350,7 +350,7 @@ if enabled libxine; then log " $XINEPLUGINDIR" test_library XINE libavutil "libavutil/mem.h" "-lavutil" "av_mallocz(1)" - test_library XINE libjpeg "jpeglib.h" "-ljpeg" "jpeg_create_compress(0)" + test_library JPEG libjpeg "jpeglib.h" "-ljpeg" "jpeg_create_compress(0)" test_library X11 x11 "X11/X.h" "-lX11" "XInitThreads()" if enabled x11; then test_library X11 xext "X11/extensions/Xext.h" "-lXext" "" @@ -444,6 +444,7 @@ echo "CFLAGS_XINE += $CFLAGS_XINE">>$makefile echo "CFLAGS_VDR += $CFLAGS_VDR">>$makefile echo "CFLAGS_X11 += $CFLAGS_X11">>$makefile echo "LIBS_XINE += $LIBS_XINE">>$makefile +echo "LIBS_JPEG += $LIBS_JPEG">>$makefile echo "LIBS_VDR += $LIBS_VDR">>$makefile echo "LIBS_X11 += $LIBS_X11">>$makefile |