Merge pull request #4852 from FernetMenta/aefixes

[vuplus_xbmc] / lib / Makefile.in

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 2ea47fb..ca18a4a 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -6,13 +6,19 @@ CC=@CC@
 CXX=@CXX@
 SYSDIR=@abs_top_srcdir@/system/players/dvdplayer
 
-AVFORMAT_SO=avformat-53-$(ARCH).so
-AVCODEC_SO=avcodec-53-$(ARCH).so
-AVUTIL_SO=avutil-51-$(ARCH).so
-AVFILTER_SO=avfilter-2-$(ARCH).so
-SWSCALE_SO=swscale-2-$(ARCH).so
-POSTPROC_SO=postproc-52-$(ARCH).so
-SWRESAMPLE_SO=swresample-0-$(ARCH).so
+ifeq (@USE_ANDROID@,1)
+AVPREFIX=lib
+else
+AVPREFIX=
+endif
+
+AVFORMAT_SO=$(AVPREFIX)avformat-54-$(ARCH).so
+AVCODEC_SO=$(AVPREFIX)avcodec-54-$(ARCH).so
+AVUTIL_SO=$(AVPREFIX)avutil-52-$(ARCH).so
+AVFILTER_SO=$(AVPREFIX)avfilter-3-$(ARCH).so
+SWSCALE_SO=$(AVPREFIX)swscale-2-$(ARCH).so
+POSTPROC_SO=$(AVPREFIX)postproc-52-$(ARCH).so
+SWRESAMPLE_SO=$(AVPREFIX)swresample-0-$(ARCH).so
 
 DIRS=
 ifneq (@USE_EXTERNAL_FFMPEG@,1)
@@ -21,6 +27,7 @@ endif
 
 LIBS=
 ifneq (@USE_EXTERNAL_FFMPEG@,1)
+ifneq (@USE_STATIC_FFMPEG@,1)
   LIBS+=$(AVUTIL_SO) \
        $(AVCODEC_SO) \
        $(AVFORMAT_SO) \
@@ -29,10 +36,12 @@ ifneq (@USE_EXTERNAL_FFMPEG@,1)
        $(SWSCALE_SO) \
        $(SWRESAMPLE_SO)
 endif
+endif
 
 .PHONY: $(DIRS) codecs
 
 ifneq ($(findstring osx,$(ARCH)), osx)
+ifneq (@USE_STATIC_FFMPEG@,1)
 
 codecs: $(addprefix $(SYSDIR)/, $(LIBS));
 
@@ -65,11 +74,24 @@ ffmpeg/libswscale/libswscale.so   : ffmpeg;
 ffmpeg/libpostproc/libpostproc.so : ffmpeg;
 ffmpeg/libswresample/libswresample.so : ffmpeg;
 endif
+endif
+
+ifeq (@USE_STATIC_FFMPEG@,1)
+ffmpeg/libavutil/libavutil.a     : ffmpeg;
+ffmpeg/libavcodec/libavcodec.a   : ffmpeg;
+ffmpeg/libavformat/libavformat.a : ffmpeg;
+ffmpeg/libavfilter/libavfilter.a : ffmpeg;
+ffmpeg/libswscale/libswscale.a   : ffmpeg;
+ffmpeg/libpostproc/libpostproc.a : ffmpeg;
+ffmpeg/libswresample/libswresample.a : ffmpeg;
+endif
 
 ffmpeg:
        $(MAKE) -C $@
 ifeq ($(findstring osx,$(ARCH)), osx)
-       $(AR) d ffmpeg/libavcodec/libavcodec.a inverse.o
+       -$(AR) d ffmpeg/libavcodec/libavcodec.a log2_tab.o
+       -$(AR) d ffmpeg/libavformat/libavformat.a log2_tab.o
+       -$(AR) d ffmpeg/libswresample/libswresample.a log2_tab.o
 endif
 
 clean: