diff options
| -rw-r--r-- | configure.in | 7 | ||||
| -rw-r--r-- | xbmc/cores/DllLoader/exports/emu_msvcrt.h | 7 |
2 files changed, 5 insertions, 9 deletions
diff --git a/configure.in b/configure.in index 90f43fb8dd..9c05933e03 100644 --- a/configure.in +++ b/configure.in @@ -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 @@ -2814,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 \ @@ -2826,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 \ @@ -2844,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}" \ diff --git a/xbmc/cores/DllLoader/exports/emu_msvcrt.h b/xbmc/cores/DllLoader/exports/emu_msvcrt.h index f66678ad5a..1c3ae17ea5 100644 --- a/xbmc/cores/DllLoader/exports/emu_msvcrt.h +++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.h @@ -26,17 +26,12 @@ #define _onexit_t void* #endif -#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) +#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) typedef off_t __off_t; typedef int64_t off64_t; typedef off64_t __off64_t; typedef fpos_t fpos64_t; #endif -#if defined(TARGET_ANDROID) -typedef long int __off_t; -typedef long int __off64_t; -typedef fpos_t fpos64_t; // no 64-bit on android -#endif #ifdef TARGET_WINDOWS #include "win32/dirent.h" |