[Android] Build extra tools required for building contribs
Martin Storsjö
git at videolan.org
Tue Apr 2 14:50:06 CEST 2013
vlc-ports/android | branch: master | Martin Storsjö <martin at martin.st> | Mon Apr 1 23:09:59 2013 +0300| [150c019ea8fc00e3e66c8606106d41e77ce3d6b1] | committer: Martin Storsjö
Build extra tools required for building contribs
This allows building contribs out of the box on OS X.
Signed-off-by: Martin Storsjö <martin at martin.st>
> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=150c019ea8fc00e3e66c8606106d41e77ce3d6b1
---
compile.sh | 25 ++++++++++++++++---------
1 file changed, 16 insertions(+), 9 deletions(-)
diff --git a/compile.sh b/compile.sh
index d9cf3d7..b19060b 100755
--- a/compile.sh
+++ b/compile.sh
@@ -137,6 +137,22 @@ EXTRA_CFLAGS="${EXTRA_CFLAGS} -O2"
EXTRA_CFLAGS="${EXTRA_CFLAGS} -I${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++${CXXSTL}/include"
EXTRA_CFLAGS="${EXTRA_CFLAGS} -I${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++${CXXSTL}/libs/${ANDROID_ABI}/include"
+MAKEFLAGS=
+if which nproc >/dev/null
+then
+MAKEFLAGS=-j`nproc`
+elif which sysctl >/dev/null
+then
+MAKEFLAGS=-j`sysctl -n machdep.cpu.thread_count`
+fi
+
+export PATH=`pwd`/extras/tools/build/bin:$PATH
+echo "Building tools"
+cd extras/tools
+./bootstrap
+make $MAKEFLAGS
+cd ../..
+
echo "Building the contribs"
mkdir -p contrib/android
cd contrib/android
@@ -178,15 +194,6 @@ else
OPTS="--enable-debug"
fi
-MAKEFLAGS=
-if which nproc >/dev/null
-then
-MAKEFLAGS=-j`nproc`
-elif which sysctl >/dev/null
-then
-MAKEFLAGS=-j`sysctl -n machdep.cpu.thread_count`
-fi
-
echo "EXTRA_CFLAGS= -g ${EXTRA_CFLAGS}" >> config.mak
export VLC_EXTRA_CFLAGS="${EXTRA_CFLAGS}"
More information about the Android
mailing list