repair prepare_sources.sh (should not ask for NDK path !)
This commit is contained in:
parent
f04c20279f
commit
29e52cdab4
1 changed files with 12 additions and 5 deletions
|
@ -2,12 +2,18 @@
|
||||||
|
|
||||||
topdir=`pwd`
|
topdir=`pwd`
|
||||||
|
|
||||||
if [ $# -ne 1 ]
|
if test -z "$1" ; then
|
||||||
then
|
ndk_build_path=`which ndk-build`
|
||||||
"Error : path to the ndk as parameter."
|
NDK_PATH=`dirname $ndk_build_path`
|
||||||
exit 65
|
if test -z "NDK_PATH" ; then
|
||||||
|
echo "Path to Android NDK not set, please specify it as first argument of $0"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
NDK_PATH=$1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
echo "using $NDK_PATH as android NDK"
|
||||||
|
|
||||||
cd submodules/externals/ffmpeg
|
cd submodules/externals/ffmpeg
|
||||||
if test -z "`git status | grep neon`" ; then
|
if test -z "`git status | grep neon`" ; then
|
||||||
echo "Applying patch to ffmpeg"
|
echo "Applying patch to ffmpeg"
|
||||||
|
@ -17,9 +23,10 @@ fi
|
||||||
|
|
||||||
cd $topdir/submodules/libilbc-rfc3951 && ./autogen.sh && ./configure && make || ( echo "iLBC prepare stage failed" ; exit 1 )
|
cd $topdir/submodules/libilbc-rfc3951 && ./autogen.sh && ./configure && make || ( echo "iLBC prepare stage failed" ; exit 1 )
|
||||||
|
|
||||||
cd $topdir/submodules/externals/libvpx && ./configure --target=armv7-android-gcc --sdk-path=$1 --enable-error-concealment && make asm_com_offsets.asm || ( echo "VP8 prepare stage failed." ; exit 1 )
|
cd $topdir/submodules/externals/libvpx && ./configure --target=armv7-android-gcc --sdk-path=$NDK_PATH --enable-error-concealment && make asm_com_offsets.asm || ( echo "VP8 prepare stage failed." ; exit 1 )
|
||||||
|
|
||||||
cd $topdir/submodules/mssilk && ./autogen.sh && ./configure --host=arm-linux MEDIASTREAMER_CFLAGS=" " MEDIASTREAMER_LIBS=" " && cd sdk && make extract-sources || ( echo "SILK audio plugin prepare state failed." ; exit 1 )
|
cd $topdir/submodules/mssilk && ./autogen.sh && ./configure --host=arm-linux MEDIASTREAMER_CFLAGS=" " MEDIASTREAMER_LIBS=" " && cd sdk && make extract-sources || ( echo "SILK audio plugin prepare state failed." ; exit 1 )
|
||||||
|
|
||||||
# As a memo, the config.h for zrtpcpp is generated using the command
|
# As a memo, the config.h for zrtpcpp is generated using the command
|
||||||
# cmake -Denable-ccrtp=false submodules/externals/libzrtpcpp
|
# cmake -Denable-ccrtp=false submodules/externals/libzrtpcpp
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue