FIX: [stagefright] dyload the whole codec to prevent potential future api breakage

[vuplus_xbmc] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 77cf789..76d6396 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -14,7 +14,11 @@ XBMCTEX_DIRS= \
 
 DVDPCODECS_DIRS= \
        lib \
-       lib/libdvd
+       lib/libdvd 
+
+ifeq (@USE_LIBSTAGEFRIGHT@,1)
+DVDPCODECS_DIRS += xbmc/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS
+endif
 
 DVDPLAYER_ARCHIVES=xbmc/cores/dvdplayer/DVDPlayer.a \
                    xbmc/cores/dvdplayer/DVDCodecs/DVDCodecs.a \
@@ -180,10 +184,6 @@ DIRECTORY_ARCHIVES += xbmc/android/bionic_supplement/bionic_supplement.a
 DIRECTORY_ARCHIVES += xbmc/android/jni/jni.a
 endif
 
-ifeq (@USE_AMLPLAYER@,1)
-DIRECTORY_ARCHIVES += xbmc/cores/amlplayer/amlplayer.a
-endif
-
 ifeq (@USE_OMXPLAYER@,1)
 DIRECTORY_ARCHIVES += xbmc/cores/omxplayer/omxplayer.a
 endif
@@ -307,9 +307,11 @@ CHECK_LIBS = xbmc/filesystem/test/filesystemTest.a \
              xbmc/utils/test/utilsTest.a \
              xbmc/threads/test/threadTest.a \
              xbmc/interfaces/python/test/pythonSwigTest.a \
-             xbmc/windowing/tests/wayland/test_wayland.a \
              xbmc/test/xbmc-test.a
 
+ifeq (@USE_WAYLAND@,1)
+CHECK_LIBS += xbmc/windowing/tests/wayland/test_wayland.a
+
 ifeq (@USE_WAYLAND_TEST_EXTENSION@,1)
 WAYLAND_TEST_MODULE = xbmc/windowing/tests/wayland/xbmc-wayland-test-extension.so
 $(WAYLAND_TEST_MODULE): force
@@ -317,6 +319,7 @@ $(WAYLAND_TEST_MODULE): force
 CHECK_EXTENSIONS = $(WAYLAND_TEST_MODULE)
 CHECK_LIBADD=@WAYLAND_TEST_LIBS@
 endif
+endif
 
 CHECK_PROGRAMS = xbmc-test
 
@@ -330,7 +333,7 @@ all : $(FINAL_TARGETS)
 include Makefile.include
 
 .PHONY : dllloader exports visualizations screensavers eventclients papcodecs \
-       dvdpcodecs imagelib codecs externals force skins libaddon check \
+       dvdpcodecs dvdpextcodecs imagelib codecs externals force skins libaddon check \
        testframework testsuite
 
 # hack targets to keep build system up to date
@@ -403,6 +406,14 @@ libaddon: exports
 dvdpcodecs: dllloader
        $(MAKE) -C lib
        $(MAKE) -C lib/libdvd
+
+ifeq (@USE_LIBSTAGEFRIGHT@,1)
+dvdpextcodecs: libxbmc.so 
+       $(MAKE) -C xbmc/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS
+else
+dvdpextcodecs:
+endif
+
 eventclients:
 ifeq ($(findstring osx,@ARCH@), osx)
 ifneq ($(findstring arm,@ARCH@), arm)
@@ -443,7 +454,7 @@ ifeq (@USE_PVR_ADDONS@,1)
        $(MAKE) -C pvr-addons
 endif
 
-codecs: papcodecs dvdpcodecs
+codecs: papcodecs dvdpcodecs dvdpextcodecs
 
 libs: libhdhomerun imagelib libexif system/libcpluff-@ARCH@.so $(CMYTH)
 
@@ -546,6 +557,9 @@ install: install-binaries install-arch install-datas
 apk: install
        make -C tools/android/packaging
 
+apk-clean: 
+       make -C tools/android/packaging clean
+
 install-binaries: install-scripts
        @echo "Copying XBMC binary to $(DESTDIR)$(libdir)/xbmc/"
        @install -d $(DESTDIR)$(libdir)/xbmc