Skip to content

Commit 62e8e91

Browse files
Experiment: build FFmpeg on Travis.
Let's see how workable / problematic this is. Can improve our scripts more to make this easier / more automatic.
1 parent 06d00f2 commit 62e8e91

File tree

3 files changed

+13
-1
lines changed

3 files changed

+13
-1
lines changed

.travis.sh

+10
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,10 @@ travis_install() {
114114
travis_script() {
115115
# Compile PPSSPP
116116
if [ "$PPSSPP_BUILD_TYPE" = "Linux" ]; then
117+
pushd ffmpeg
118+
./linux_x86-64.sh
119+
popd
120+
117121
if [ "$QT" = "TRUE" ]; then
118122
./b.sh --qt
119123
else
@@ -126,6 +130,12 @@ travis_script() {
126130
export NDK_TOOLCHAIN_VERSION=clang
127131
fi
128132

133+
export NDK_PREBUILT=$NDK/toolchains/x86_64-4.9/prebuilt/linux-x86_64
134+
export NDK_PREBUILTLLVM=$NDK/toolchains/llvm/prebuilt/linux-x86_64
135+
pushd ffmpeg
136+
./android_$APP_ABI.sh
137+
popd
138+
129139
pushd android
130140
./ab.sh -j2 APP_ABI=$APP_ABI
131141
popd

.travis.yml

+2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ addons:
1919
- lib32z1
2020
- lib32z1-dev
2121
- lib32bz2-1.0
22+
- yasm
23+
- diffutils
2224

2325
cache:
2426
- apt

ffmpeg

Submodule ffmpeg updated 277 files

0 commit comments

Comments
 (0)