diff options
| author | Memphiz <memphis@machzwo.de> | 2015-01-23 08:51:10 +0100 |
|---|---|---|
| committer | Memphiz <memphis@machzwo.de> | 2015-01-27 12:54:13 +0100 |
| commit | e66302f82b628d37c59dcd56353e1e76025ac4f0 (patch) | |
| tree | 6dd96503a47f35c2aa031ec758d7045c670fb348 /tools | |
| parent | 2a05f50f27e9c189894c3146eb93fb74f19b1997 (diff) | |
[depends/droid] - get rid of the NDK_VER parsing/define - not needed anymore as we rely on ndk r9c now (sed works differently on darwin and never got the parsing right)
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/depends/Makefile.include.in | 7 | ||||
| -rw-r--r-- | tools/depends/configure.in | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/tools/depends/Makefile.include.in b/tools/depends/Makefile.include.in index 51131ab802..e1ac05c9af 100644 --- a/tools/depends/Makefile.include.in +++ b/tools/depends/Makefile.include.in @@ -2,7 +2,6 @@ abs_top_srcdir=@abs_top_srcdir@ TOOLCHAIN=@use_toolchain@ NDKROOT=@use_ndk@ -NDK_VER=@use_ndk_ver@ SDKROOT=@use_sdk_path@ XBMCROOT=$(abspath $(abs_top_srcdir)/../../) TARBALLS_LOCATION=@use_tarballs@ @@ -54,10 +53,10 @@ READELF=@READELF@ OBJDUMP=@OBJDUMP@ CMAKE=@prefix@/@tool_dir@/bin/cmake -DCMAKE_TOOLCHAIN_FILE=$(PREFIX)/share/Toolchain.cmake -DCMAKE_INSTALL_PREFIX=$(PREFIX) -CFLAGS=@platform_cflags@ @platform_includes@ -isystem @prefix@/@deps_dir@/include -DNDK_VER=@use_ndk_ver@ +CFLAGS=@platform_cflags@ @platform_includes@ -isystem @prefix@/@deps_dir@/include LDFLAGS=-L@prefix@/@deps_dir@/lib @platform_ldflags@ -CXXFLAGS=@platform_cxxflags@ @platform_includes@ -isystem @prefix@/@deps_dir@/include -DNDK_VER=@use_ndk_ver@ -CPPFLAGS=@platform_cflags@ @platform_includes@ -isystem @prefix@/@deps_dir@/include -DNDK_VER=@use_ndk_ver@ +CXXFLAGS=@platform_cxxflags@ @platform_includes@ -isystem @prefix@/@deps_dir@/include +CPPFLAGS=@platform_cflags@ @platform_includes@ -isystem @prefix@/@deps_dir@/include PATH:=@prefix@/@tool_dir@/bin:$(PATH) ifneq (@use_build_toolchain@,) diff --git a/tools/depends/configure.in b/tools/depends/configure.in index 6d0199e2ad..37be22712c 100644 --- a/tools/depends/configure.in +++ b/tools/depends/configure.in @@ -402,7 +402,6 @@ if test "$platform_os" == "android"; then if ! test -f "$use_ndk/RELEASE.TXT" ; then AC_MSG_ERROR("$use_ndk is not an NDK directory") fi - use_ndk_ver=0x`cat $use_ndk/RELEASE.TXT | sed 's/^r\([[0-9a-z]]\+\)\b.*/\1/'` if test -z $use_sdk_path; then AC_MSG_ERROR("SDK path is required for android") @@ -486,7 +485,6 @@ if test "$platform_os" == "android"; then echo -e AC_SUBST(use_sdk_path) AC_SUBST(use_ndk) - AC_SUBST(use_ndk_ver) AC_SUBST(use_sdk) fi |