From 32442641dc8df4472f4e77caa04ab7c8b2e2f6ca Mon Sep 17 00:00:00 2001 From: Sergii Pylypenko Date: Thu, 17 Oct 2019 21:19:43 +0300 Subject: [PATCH] OpenTTD: updated build script --- project/jni/application/openttd-jgrpp/src | 2 +- project/jni/application/openttd/AndroidBuild.sh | 2 +- project/jni/application/openttd/src | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/project/jni/application/openttd-jgrpp/src b/project/jni/application/openttd-jgrpp/src index 8285bf4ff..e8564ba3b 160000 --- a/project/jni/application/openttd-jgrpp/src +++ b/project/jni/application/openttd-jgrpp/src @@ -1 +1 @@ -Subproject commit 8285bf4ff936d1ad12f0d03dc34a7975413ff1b3 +Subproject commit e8564ba3beb60956165cfb689c668a5fe299b135 diff --git a/project/jni/application/openttd/AndroidBuild.sh b/project/jni/application/openttd/AndroidBuild.sh index cd628874a..446b8bcfc 100755 --- a/project/jni/application/openttd/AndroidBuild.sh +++ b/project/jni/application/openttd/AndroidBuild.sh @@ -32,7 +32,7 @@ CPU_TYPE=32 env CXXFLAGS_BUILD="-I." \ env LDFLAGS_BUILD="-L." \ env CLANG=1 ../setEnvironment-$1.sh sh -c "cd openttd-$VER-$1 && env ../src/configure \ - --with-sdl --with-freetype --with-png --with-zlib --with-icu --with-libtimidity --without-fluidsynth \ + --with-sdl=sdl1 --with-freetype --with-png --with-zlib --with-icu --with-libtimidity --without-fluidsynth \ --with-lzo2=$LOCAL_PATH/../../../obj/local/$ARCH/liblzo2.so --prefix-dir='.' --data-dir='' \ --without-allegro --with-fontconfig --with-lzma --cpu-type=$CPU_TYPE --os=android --cc-build=gcc --cxx-build=g++" } || exit 1 diff --git a/project/jni/application/openttd/src b/project/jni/application/openttd/src index 170e4dbc4..7317193d3 160000 --- a/project/jni/application/openttd/src +++ b/project/jni/application/openttd/src @@ -1 +1 @@ -Subproject commit 170e4dbc4877e9ae3e727be9455f9c340ae4ba1e +Subproject commit 7317193d3d5bf374e406cde34fcccf88562a6bce