jsonrpc: add missing "order" property to Video.Cast in API definition

[vuplus_xbmc] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 544c8c3..428b67c 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -91,6 +91,7 @@ DIRECTORY_ARCHIVES=$(DVDPLAYER_ARCHIVES) \
                    xbmc/rendering/rendering.a \
                    xbmc/settings/settings.a \
                    xbmc/settings/dialogs/settings_dialogs.a \
+                   xbmc/settings/lib/settings_lib.a \
                    xbmc/settings/windows/settings_windows.a \
                    xbmc/storage/storage.a \
                    xbmc/utils/utils.a \
@@ -487,6 +488,17 @@ ifeq ($(findstring freebsd,@ARCH@),freebsd)
 DYNOBJSXBMC+= xbmc/freebsd/freebsd.a
 endif
 
+ifeq (@USE_STATIC_FFMPEG@,1)
+DYNOBJSXBMC += 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
+LIBS+= @GNUTLS_ALL_LIBS@ @VORBISENC_ALL_LIBS@
+endif
+
 OBJSXBMC:=$(filter-out $(DYNOBJSXBMC), $(OBJSXBMC))
 
 MAINOBJS=xbmc/xbmc.o
@@ -555,10 +567,10 @@ ifeq ($(findstring osx,@ARCH@), osx)
 else
 install: install-binaries install-arch install-datas
 
-apk: install
+apk: apk-clean install
        make -C tools/android/packaging
 
-apk-clean: 
+apk-clean:
        make -C tools/android/packaging clean
 
 install-binaries: install-scripts