From 42b6d73fbfd404c51048bcc200fdad99b9c7dbc6 Mon Sep 17 00:00:00 2001 From: Miguel Horta Date: Tue, 12 Apr 2022 20:20:26 +0100 Subject: [PATCH] Fix packging --- project/jni/application/openttd/AndroidBuild.sh | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/project/jni/application/openttd/AndroidBuild.sh b/project/jni/application/openttd/AndroidBuild.sh index 232466e23..dbd143976 100755 --- a/project/jni/application/openttd/AndroidBuild.sh +++ b/project/jni/application/openttd/AndroidBuild.sh @@ -96,7 +96,14 @@ export ARCH=$1 mkdir -p staging-openttd-$VER-$1 -cmake --build openttd-$VER-$1 --verbose && \ - cmake --install openttd-$VER-$1 --prefix ./staging-openttd-$VER-$1 && \ - cp staging-openttd-$VER-$1/games/libapplication.so libapplication-$1.so || \ -exit 1 +set -e + +cmake --build openttd-$VER-$1 --verbose; +cmake --install openttd-$VER-$1 --prefix ./staging-openttd-$VER-$1; +cp staging-openttd-$VER-$1/games/libapplication.so libapplication-$1.so; +cp staging-openttd-$VER-$1/games/libapplication.so libapplication-$1.so; +mkdir -p ./data +cp -r staging-openttd-$VER-$1/share/games/application/* data/ +./pack-data.sh + +set +e