From 54daeba17c5de819a932950335871c093821e8cf Mon Sep 17 00:00:00 2001 From: Sergii Pylypenko Date: Fri, 1 Jun 2018 23:43:39 +0300 Subject: [PATCH] OpenTTD: fixed 64-build compilation --- project/jni/application/openttd/AndroidBuild.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/project/jni/application/openttd/AndroidBuild.sh b/project/jni/application/openttd/AndroidBuild.sh index 038027867..c4d960d23 100755 --- a/project/jni/application/openttd/AndroidBuild.sh +++ b/project/jni/application/openttd/AndroidBuild.sh @@ -30,4 +30,8 @@ uname -s | grep -i "linux" > /dev/null && NCPU=`cat /proc/cpuinfo | grep -c -i p LIBATOMIC= echo $1 | grep 'armeabi-v7a' && LIBATOMIC="-lunwind" -env CLANG=1 LIBATOMIC=$LIBATOMIC ../setEnvironment-$1.sh sh -c "cd openttd-$VER-$1 && make -j$NCPU VERBOSE=1 STRIP='' LIBS='-lsdl-1.2 -llzo2 -lpng -ltimidity -lfontconfig -lfreetype -lexpat-sdl -licui18n -liculx -licu-le-hb -lharfbuzz -licuuc -licudata -lgcc -lz -lc -lc++_static -lc++abi -landroid_support $LIBATOMIC'" && cp -f openttd-$VER-$1/objs/release/openttd libapplication-$1.so || exit 1 +LIBANDROIDSUPPORT= +[ "$1" = "armeabi-v7a" ] && LIBANDROIDSUPPORT="-landroid_support" +[ "$1" = "x86" ] && LIBANDROIDSUPPORT="-landroid_support" + +env CLANG=1 LIBATOMIC=$LIBATOMIC ../setEnvironment-$1.sh sh -c "cd openttd-$VER-$1 && make -j$NCPU VERBOSE=1 STRIP='' LIBS='-lsdl-1.2 -llzo2 -lpng -ltimidity -lfontconfig -lfreetype -lexpat-sdl -licui18n -liculx -licu-le-hb -lharfbuzz -licuuc -licudata -lgcc -lz -lc -lc++_static -lc++abi $LIBANDROIDSUPPORT $LIBATOMIC'" && cp -f openttd-$VER-$1/objs/release/openttd libapplication-$1.so || exit 1