Permalink
Browse files

[configure] remove internal ffmpeg

  • Loading branch information...
1 parent 74d4dcf commit 873caee7f0f7f280467e41f2e904424bea1ad38d @wsnipex wsnipex committed with Jan 18, 2014
Showing with 282 additions and 240 deletions.
  1. +7 −7 Makefile.in
  2. +0 −3 Makefile.include.in
  3. +109 −230 configure.in
  4. +166 −0 tools/depends/target/ffmpeg/autobuild.sh
View
@@ -475,13 +475,13 @@ DYNOBJSXBMC+= xbmc/freebsd/freebsd.a
endif
ifeq (@USE_STATIC_FFMPEG@,1)
-FFMPEGOBJS = lib/ffmpeg/libavcodec/libavcodec.a \
- lib/ffmpeg/libavfilter/libavfilter.a \
- lib/ffmpeg/libswresample/libswresample.a \
- lib/ffmpeg/libavformat/libavformat.a \
- lib/ffmpeg/libavutil/libavutil.a \
- lib/ffmpeg/libpostproc/libpostproc.a \
- lib/ffmpeg/libswscale/libswscale.a
+FFMPEGOBJS = @FFMPEG_LIBDIR@/libavcodec.a \
+ @FFMPEG_LIBDIR@/libavfilter.a \
+ @FFMPEG_LIBDIR@/libswresample.a \
+ @FFMPEG_LIBDIR@/libavformat.a \
+ @FFMPEG_LIBDIR@/libavutil.a \
+ @FFMPEG_LIBDIR@/libpostproc.a \
+ @FFMPEG_LIBDIR@/libswscale.a
DYNOBJSXBMC+= $(FFMPEGOBJS)
LIBS+= @GNUTLS_ALL_LIBS@ @VORBISENC_ALL_LIBS@
View
@@ -44,9 +44,6 @@ INCLUDES+=-I@abs_top_srcdir@/addons/library.xbmc.addon
INCLUDES+=-I@abs_top_srcdir@/addons/library.xbmc.pvr
INCLUDES+=-I@abs_top_srcdir@/addons/library.xbmc.codec
INCLUDES+=$(sort @INCLUDES@)
-ifneq (@USE_EXTERNAL_FFMPEG@,1)
- INCLUDES+=-I@abs_top_srcdir@/lib/ffmpeg
-endif
INCLUDES+=-I@abs_top_srcdir@/xbmc/linux
INCLUDES+=-I@abs_top_srcdir@/xbmc/cores/dvdplayer
DEFINES+= \
Oops, something went wrong.

0 comments on commit 873caee

Please sign in to comment.