From d502c0acb105645b4bbba9ee80387e1d94809a75 Mon Sep 17 00:00:00 2001 From: pelya Date: Mon, 25 Jan 2021 21:55:21 +0200 Subject: [PATCH] OpenTTD: fixed host compilation --- project/jni/application/openttd/build-pc.sh | 7 ++++--- project/jni/application/openttd/src | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/project/jni/application/openttd/build-pc.sh b/project/jni/application/openttd/build-pc.sh index 5c394c378..97fe39ca4 100755 --- a/project/jni/application/openttd/build-pc.sh +++ b/project/jni/application/openttd/build-pc.sh @@ -14,14 +14,15 @@ export CXXFLAGS=-O0 [ -e Makefile ] || cmake ../src || exit 1 make -j8 VERBOSE=1 || exit 1 cd bin +cp -f ../baseset/opntitle.dat opntitle.sav if [ -z "$1" ]; then - ./openttd -d 2 -m null -g opntitle.sav -r 854x480 + ../openttd -d 2 -m null -g opntitle.sav -r 854x480 elif [ -n "$2" ]; then valgrind --track-fds=yes --log-file=../../valgrind.log --leak-check=full \ - ./openttd -d 0 -m null # -g opntitle.sav + ../openttd -d 0 -m null # -g opntitle.sav else #valgrind --track-fds=yes --log-file=valgrind.log --leak-check=full \ gdb -ex run --args \ - ./openttd -d 0 -m null -g opntitle.sav -r 854x480 + ../openttd -d 0 -m null -g opntitle.sav -r 854x480 fi diff --git a/project/jni/application/openttd/src b/project/jni/application/openttd/src index 2bc059512..a4aa47c29 160000 --- a/project/jni/application/openttd/src +++ b/project/jni/application/openttd/src @@ -1 +1 @@ -Subproject commit 2bc05951277bcb0cedbbb5a9f6dc524bb0bbea1b +Subproject commit a4aa47c29a1b77118f51230fef71384903e84c7d