From 82c41117337e11f2f73a9c5d8036cb6d586425ad Mon Sep 17 00:00:00 2001 From: pelya Date: Fri, 1 Jan 2021 01:49:17 +0200 Subject: [PATCH] OpenTTD: removed useless variable from the build script --- build.sh | 2 +- project/jni/application/openttd/AndroidBuild.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index 26aeea339..ad303c302 100755 --- a/build.sh +++ b/build.sh @@ -90,7 +90,7 @@ fi MYARCH=linux-x86_64 if [ -z "$NCPU" ]; then - NCPU=4 + NCPU=8 if uname -s | grep -i "linux" > /dev/null ; then MYARCH=linux-x86_64 NCPU=`cat /proc/cpuinfo | grep -c -i processor` diff --git a/project/jni/application/openttd/AndroidBuild.sh b/project/jni/application/openttd/AndroidBuild.sh index 446b8bcfc..ff3722ab7 100755 --- a/project/jni/application/openttd/AndroidBuild.sh +++ b/project/jni/application/openttd/AndroidBuild.sh @@ -31,7 +31,7 @@ CPU_TYPE=32 env CFLAGS_BUILD="-I." \ env CXXFLAGS_BUILD="-I." \ env LDFLAGS_BUILD="-L." \ - env CLANG=1 ../setEnvironment-$1.sh sh -c "cd openttd-$VER-$1 && env ../src/configure \ + ../setEnvironment-$1.sh sh -c "cd openttd-$VER-$1 && env ../src/configure \ --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++"