diff options
| -rw-r--r-- | configure.in | 15 | ||||
| -rw-r--r-- | tools/depends/target/xbmc/Makefile | 5 |
2 files changed, 4 insertions, 16 deletions
diff --git a/configure.in b/configure.in index 3babacf781..d63d13dc21 100644 --- a/configure.in +++ b/configure.in @@ -45,15 +45,6 @@ AC_DEFUN([XB_ADD_CODEC], esac ]) -# force enable a codec -AC_DEFUN([XB_FORCE_CODEC], -[ - AC_MSG_CHECKING([for $2]) - AC_SUBST([USE_$1], 1) - AC_DEFINE([HAS_$1], 1, [using $2]) - AC_MSG_RESULT([enabling $2]) -]) - # check for library basenames AC_DEFUN([XB_FIND_SONAME], [ @@ -1859,12 +1850,6 @@ case $add_codecs in XB_ADD_CODEC([LIBSTAGEFRIGHT], [libstagefright]) ;; *) - # if no codec specified and android -> enable libstagefright - if test "$target_platform" = "target_android" ; then - LIBS+="-L${prefix}/opt/android-libs -lstdc++ -lutils -lcutils -lstagefright -lbinder -lui -lgui" - XB_FORCE_CODEC([LIBSTAGEFRIGHT], [libstagefright]) - fi - ;; esac # platform specific bin utilities diff --git a/tools/depends/target/xbmc/Makefile b/tools/depends/target/xbmc/Makefile index be6febf7b6..c1febce871 100644 --- a/tools/depends/target/xbmc/Makefile +++ b/tools/depends/target/xbmc/Makefile @@ -6,9 +6,12 @@ export CXXFLAGS+=-O3 export CFLAGS+=-O3 # configuration settings -CONFIGURE=cp -f $(CONFIG_SUB) $(CONFIG_GUESS) build-aux/ ;\ +CONFIGURE = cp -f $(CONFIG_SUB) $(CONFIG_GUESS) build-aux/ ;\ ./configure --prefix=$(PREFIX) +ifeq ($(OS),android) +CONFIGURE += --enable-codec=libstagefright +endif all: $(SOURCE)/libxbmc.so |