miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OpenTTD JGR: disabled fluidsynth, because it crashes

Browse Source
This commit is contained in:
Sergii Pylypenko
2019-09-03 21:23:51 +03:00
parent f2074457a4
commit 3f8e0ea9a9
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
project/jni/application/openttd-jgrpp/AndroidAppSettings.cfg
View File

@@ -20,7 +20,7 @@ AppVersionName="0.31.5"
# You can specify Google Play expansion files in the form 'obb:main.12345' or 'obb:patch.12345' where 12345 is the app version for obb file
# You can use .zip.xz archives for better compression, but you need to add 'lzma' to CompiledLibraries
# Generate .zip.xz files like this: zip -0 -r data.zip your-data/* ; xz -8 data.zip
AppDataDownloadUrl="!!Data files|openttd-data-0.31.5-0.zip.xz^!!MIDI music support|GeneralUser-GS-v1.471.sf2.zip.xz^!!Internationalization files|icudt62l.zip.xz"
AppDataDownloadUrl="!!Data files|openttd-data-0.31.5-0.zip.xz^!!Internationalization files|icudt62l.zip.xz"
# Reset SDL config when updating application to the new version (y) / (n)
ResetSdlConfigForThisVersion=y
@@ -275,7 +275,7 @@ MultiABI='arm64-v8a'
# Optional shared libraries to compile - removing some of them will save space
# MP3 patents are expired, but libmad license is GPL, not LGPL
# Available libraries: mad (GPL-ed!) sdl_mixer sdl_image sdl_ttf sdl_net sdl_blitpool sdl_gfx sdl_sound intl xml2 lua jpeg png ogg flac tremor vorbis freetype xerces curl theora fluidsynth lzma lzo2 mikmod openal timidity zzip bzip2 yaml-cpp python boost_date_time boost_filesystem boost_iostreams boost_program_options boost_regex boost_signals boost_system boost_thread glu avcodec avdevice avfilter avformat avresample avutil swscale swresample bzip2
CompiledLibraries="c++_shared jpeg png freetype fluidsynth expat fontconfig lzma lzo2 icui18n iculx icu-le-hb harfbuzz icudata icuuc"
CompiledLibraries="c++_shared jpeg png freetype expat fontconfig lzma lzo2 icui18n iculx icu-le-hb harfbuzz icudata icuuc"
# Application uses custom build script AndroidBuild.sh instead of Android.mk (y) or (n)
CustomBuildScript=y

2
project/jni/application/openttd-jgrpp/AndroidBuild.sh
View File

@@ -33,7 +33,7 @@ CPU_TYPE=32
env LDFLAGS_BUILD="-L." \
env ANDROID=1 \
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-fluidsynth \
--with-sdl --with-freetype --with-png --with-zlib --with-icu --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=unix --cc-build=gcc --cxx-build=g++ --without-sse"
} || exit 1

2
project/jni/application/openttd-jgrpp/build-pc.sh
View File

@@ -20,7 +20,7 @@ cd bin
export LD_LIBRARY_PATH=/usr/local/lib
if [ -z "$1" ]; then
./openttd -d 0 -m null -g opntitle.sav
./openttd -d 0 -g opntitle.sav
elif [ -n "$2" ]; then
valgrind --track-fds=yes --log-file=../../valgrind.log --leak-check=full \
./openttd -d 0 -m null # -g opntitle.sav