aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Pfau <pfau@peakwork.de>2016-09-27 10:04:59 +0200
committerwsnipex <wsnipex@a1.net>2016-10-09 10:53:39 +0200
commit60be62cc65fb599dc747867059773dff3d392596 (patch)
tree1c0aebb14e64e6fcff98fd3f855292630d2890c6
parent1851d57783b8bcb60684876b41ca9cd191d19a0d (diff)
bump default sdk version to 21 / remove offs64 overrides in dvdnav/read
-rw-r--r--tools/depends/configure.ac2
-rw-r--r--tools/depends/target/libdvdnav/Makefile3
-rw-r--r--tools/depends/target/libdvdread/Makefile3
3 files changed, 1 insertions, 7 deletions
diff --git a/tools/depends/configure.ac b/tools/depends/configure.ac
index 6345adbfdb..b09c2b78df 100644
--- a/tools/depends/configure.ac
+++ b/tools/depends/configure.ac
@@ -130,7 +130,7 @@ case $host in
if test "x$use_cpu" = "xauto"; then
use_cpu="armeabi-v7a"
fi
- use_sdk="${use_sdk:-android-17}"
+ use_sdk="${use_sdk:-android-21}"
deps_dir="$use_host-$use_sdk"
platform_cflags="-DANDROID -Os -fexceptions"
if test "x$use_cpu" = "xarmeabi-v7a"; then
diff --git a/tools/depends/target/libdvdnav/Makefile b/tools/depends/target/libdvdnav/Makefile
index 3127c13bc7..cd44351f0c 100644
--- a/tools/depends/target/libdvdnav/Makefile
+++ b/tools/depends/target/libdvdnav/Makefile
@@ -22,9 +22,6 @@ else
endif
-ifeq ($(OS),android)
- EXTRA_CFLAGS += -D_FILE_OFFSET_BITS=64 -D_OFF_T_DEFINED_ -Doff_t=off64_t -Dlseek=lseek64
-endif
ifeq ($(OS),osx)
EXTRA_CFLAGS += -D__DARWIN__
endif
diff --git a/tools/depends/target/libdvdread/Makefile b/tools/depends/target/libdvdread/Makefile
index a4f0441b85..3652f1b1f2 100644
--- a/tools/depends/target/libdvdread/Makefile
+++ b/tools/depends/target/libdvdread/Makefile
@@ -25,9 +25,6 @@ ifneq ($(OS),ios)
config += --with-libdvdcss
EXTRA_CFLAGS += -DHAVE_DVDCSS_DVDCSS_H
endif
-ifeq ($(OS),android)
- EXTRA_CFLAGS += -D_FILE_OFFSET_BITS=64 -D_OFF_T_DEFINED_ -Doff_t=off64_t -Dlseek=lseek64
-endif
ifeq ($(OS),osx)
EXTRA_CFLAGS += -D__DARWIN__
endif