From 2330c338c381d1b21e6990dc60c9f138141cdd96 Mon Sep 17 00:00:00 2001 From: Rui Zhang Date: Sun, 29 Jul 2012 11:14:41 +0800 Subject: [PATCH] fix build with ndk-macosx Close #7244 Signed-off-by: Jean-Baptiste Kempf --- compile.sh | 1 + configure.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/compile.sh b/compile.sh index 4def041d7..4add5ae28 100755 --- a/compile.sh +++ b/compile.sh @@ -57,6 +57,7 @@ export PLATFORM_SHORT_ARCH # Add the NDK toolchain to the PATH, needed both for contribs and for building # stub libraries +export PATH=${ANDROID_NDK}/toolchains/${PATH_HOST}-4.4.3/prebuilt/darwin-x86/bin:${PATH} export PATH=${ANDROID_NDK}/toolchains/${PATH_HOST}-4.4.3/prebuilt/linux-x86/bin:${PATH} # 1/ libvlc, libvlccore and its plugins diff --git a/configure.sh b/configure.sh index 2c5cdaede..71e39b4f3 100755 --- a/configure.sh +++ b/configure.sh @@ -36,7 +36,7 @@ CPPFLAGS="-I${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/include -I${ANDROID_NDK LDFLAGS="$LDFLAGS -L${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/libs/${ANDROID_ABI}" SYSROOT=$ANDROID_NDK/platforms/$ANDROID_API/arch-$PLATFORM_SHORT_ARCH -ANDROID_BIN=$ANDROID_NDK/toolchains/${PATH_HOST}-4.4.3/prebuilt/linux-x86/bin/ +ANDROID_BIN=$ANDROID_NDK/toolchains/${PATH_HOST}-4.4.3/prebuilt/*-x86/bin/ CROSS_COMPILE=${ANDROID_BIN}/${TARGET_TUPLE}- CPPFLAGS="$CPPFLAGS" \ -- GitLab