diff options
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/configure.in b/configure.in index 6d839e0736..294e30011e 100644 --- a/configure.in +++ b/configure.in @@ -545,7 +545,7 @@ AC_ARG_ENABLE([libcap], AC_ARG_ENABLE([player], [AS_HELP_STRING([--enable-player], - [enable additional players from a list of comma separated names, (default is none, choices are amlplayer, omxplayer)])], + [enable additional players from a list of comma separated names, (default is none, choices are omxplayer)])], [add_players=$enableval], [add_players=no]) @@ -729,6 +729,7 @@ if test "$target_platform" = "target_android" ; then USE_ANDROID=1 webserver_checkdepends=yes CFLAGS="$CFLAGS -Wno-psabi" + DROID_DVDLIB_SEEK64="-D_FILE_OFFSET_BITS=64 -D_OFF_T_DEFINED_ -Doff_t=off64_t -Dlseek=lseek64" CXXFLAGS="$CXXFLAGS -Wno-psabi" AC_DEFINE(HAS_EGLGLES, [1], [Define if supporting EGL based GLES Framebuffer]) fi @@ -1950,10 +1951,6 @@ AC_DEFINE(YAJL_MAJOR, 1, [yajl version 1]) # additional internal players case $add_players in - *amlplayer*) - AC_CHECK_HEADER([amplayer/player_error.h],, AC_MSG_ERROR($missing_headers)) - XB_ADD_PLAYER([AMLPLAYER], [amlplayer]) - ;; *omxplayer*) XB_ADD_PLAYER([OMXPLAYER], [omxplayer]) ;; @@ -2500,7 +2497,6 @@ OUTPUT_FILES="Makefile \ xbmc/cores/dvdplayer/DVDSubtitles/Makefile \ xbmc/cores/AudioEngine/Makefile \ xbmc/cores/paplayer/Makefile \ - xbmc/cores/amlplayer/Makefile \ xbmc/cores/omxplayer/Makefile \ lib/timidity/Makefile \ lib/xbadpcm/Makefile \ @@ -2819,7 +2815,7 @@ XB_CONFIG_MODULE([lib/libdvd/libdvdcss], [ ./configure \ CC="$CC" \ CXX="$CXX" \ - CFLAGS="$CFLAGS" \ + CFLAGS="$CFLAGS $DROID_DVDLIB_SEEK64" \ --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \ --host=$host_alias \ --build=$build_alias \ @@ -2831,7 +2827,7 @@ XB_CONFIG_MODULE([lib/libdvd/libdvdcss], [ XB_CONFIG_MODULE([lib/libdvd/libdvdread], [ ./configure2 \ - --extra-cflags="$CFLAGS $DVDREAD_CFLAGS -I`pwd`/../libdvdcss/src" \ + --extra-cflags="$CFLAGS $DVDREAD_CFLAGS -I`pwd`/../libdvdcss/src $DROID_DVDLIB_SEEK64" \ --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \ --host=$host_alias \ --build=$build_alias \ @@ -2849,7 +2845,7 @@ XB_CONFIG_MODULE([lib/libdvd/libdvdread], [ XB_CONFIG_MODULE([lib/libdvd/libdvdnav], [ ./configure2 \ - --extra-cflags="$CFLAGS $DVDREAD_CFLAGS -I`pwd`/../includes" \ + --extra-cflags="$CFLAGS $DVDREAD_CFLAGS -I`pwd`/../includes $DROID_DVDLIB_SEEK64" \ --extra-ldflags="-L`pwd`/../libdvdread/obj" \ --with-dvdread-config="`pwd`/../libdvdread/obj/dvdread-config" \ --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \ |