Commit 19819e59 authored by Aleix Pol Gonzalez's avatar Aleix Pol Gonzalez 🐧

Android: polish vlc-qt script

parent e9d907bf
......@@ -13,7 +13,7 @@ ARGS=
$DIR/build-cmake-native $name $url \
-DCMAKE_INSTALL_PREFIX=${APP_INSTALL_PREFIX-"/opt/kdeandroid-deps"} \
-DCMAKE_PREFIX_PATH="$QT_ANDROID;/opt/kdeandroid-deps;$APP_INSTALL_PREFIX" \
-DCMAKE_PREFIX_PATH="$QT_ANDROID;/opt/kdeandroid-deps;$APP_INSTALL_PREFIX;$EXTRA_PREFIXES" \
-DCMAKE_BUILD_TYPE=debug \
-DCMAKE_TOOLCHAIN_FILE=/opt/kdeandroid-deps/share/ECM/toolchain/Android.cmake \
-DCMAKE_ANDROID_NDK_TOOLCHAIN_VERSION=$ANDROID_NDK_TOOLCHAIN_VERSION \
......
......@@ -6,7 +6,7 @@ export PATH=$DIR:$PATH
export ANDROID_SDK=$ANDROID_SDK_ROOT
sudo apt install -y autopoint libproxy-dev
sudo apt install -y autopoint
mkdir -p $HOME/src/
cd $HOME/src/
......@@ -16,11 +16,13 @@ if [ ! -d vlc-android ] ; then
fi
cd vlc-android
./compile.sh -a armeabi-v7a
./compile-libvlc.sh -a armeabi-v7a
cp /home/user/src/vlc-android/libvlc/jni/obj/local/armeabi-v7a/libvlc.so /opt/kdeandroid-deps/lib/
VLC_INSTALL_PREFIX=/home/user/src/vlc-android/vlc/build-android-arm-linux-androideabi/install
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
$DIR/build-cmake vlc-qt https://github.com/vlc-qt/vlc-qt.git -DWITH_GLES=ON \
-DLIBVLC_INCLUDE_DIR=/home/user/src/vlc-android/vlc/build-android-arm-linux-androideabi/install/include/ \
EXTRA_PREFIXES=$VLC_INSTALL_PREFIX $DIR/build-cmake vlc-qt https://github.com/vlc-qt/vlc-qt.git -DWITH_GLES=ON \
-DECM_ADDITIONAL_FIND_ROOT_PATH=$VLC_INSTALL_PREFIX/ \
-DLIBVLC_INCLUDE_DIR=$VLC_INSTALL_PREFIX/include/ \
-DLIBVLC_LIBRARY=/home/user/src/vlc-android/libvlc/jni/obj/local/armeabi-v7a/libvlc.so \
-DLIBVLCCORE_LIBRARY=/home/user/src/vlc-android/vlc/build-android-arm-linux-androideabi/install/lib/libvlccore.a
-DLIBVLCCORE_LIBRARY=$VLC_INSTALL_PREFIX/lib/libvlccore.a
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