Commit adc6b011 authored by Konstantin Pavlov's avatar Konstantin Pavlov

libvlc-compile script fixes for 4.0 branch

Plus package contrib generation
parent c254ef00
......@@ -486,16 +486,20 @@ avlc_checkfail "contribs: bootstrap failed"
# Some libraries have arm assembly which won't build in thumb mode
# We append -marm to the CFLAGS of these libs to disable thumb mode
[ ${ANDROID_ABI} = "armeabi-v7a" ] && echo "NOTHUMB := -marm" >> config.mak
[ ${ANDROID_ABI} = "armeabi-v7a" ] && echo "NOTHUMB := -marm" >> Makefile.add
echo "EXTRA_CFLAGS=${EXTRA_CFLAGS}" >> config.mak
echo "EXTRA_CXXFLAGS=${EXTRA_CXXFLAGS}" >> config.mak
echo "EXTRA_LDFLAGS=${EXTRA_LDFLAGS}" >> config.mak
echo "CC=${NDK_TOOLCHAIN_PATH}/clang" >> config.mak
echo "CXX=${NDK_TOOLCHAIN_PATH}/clang++" >> config.mak
echo "AR=${NDK_TOOLCHAIN_PATH}/${TARGET_TUPLE}-ar" >> config.mak
echo "RANLIB=${NDK_TOOLCHAIN_PATH}/${TARGET_TUPLE}-ranlib" >> config.mak
echo "LD=${NDK_TOOLCHAIN_PATH}/${TARGET_TUPLE}-ld" >> config.mak
echo "EXTRA_CFLAGS=${EXTRA_CFLAGS}" >> Makefile.add
echo "EXTRA_CXXFLAGS=${EXTRA_CXXFLAGS}" >> Makefile.add
echo "EXTRA_LDFLAGS=${EXTRA_LDFLAGS}" >> Makefile.add
echo "CC=${NDK_TOOLCHAIN_PATH}/clang" >> Makefile.add
echo "CXX=${NDK_TOOLCHAIN_PATH}/clang++" >> Makefile.add
echo "AR=${NDK_TOOLCHAIN_PATH}/${TARGET_TUPLE}-ar" >> Makefile.add
echo "RANLIB=${NDK_TOOLCHAIN_PATH}/${TARGET_TUPLE}-ranlib" >> Makefile.add
echo "LD=${NDK_TOOLCHAIN_PATH}/${TARGET_TUPLE}-ld" >> Makefile.add
cat Makefile.add Makefile > Makefile.new
mv Makefile.new Makefile
rm -f Makefile.add
# fix modplug endianess check (narrowing error)
export ac_cv_c_bigendian=no
......@@ -507,7 +511,7 @@ avlc_checkfail "contribs: make fetch failed"
which autopoint >/dev/null || make $MAKEFLAGS .gettext
#export the PATH
# Make
make $MAKEFLAGS
make $MAKEFLAGS package
avlc_checkfail "contribs: make failed"
cd ../../
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment