diff --git a/project/jni/application/openttd-jgrpp/.gitignore b/project/jni/application/openttd-jgrpp/.gitignore index 2b107e500..c6e7b38fd 100644 --- a/project/jni/application/openttd-jgrpp/.gitignore +++ b/project/jni/application/openttd-jgrpp/.gitignore @@ -1 +1,3 @@ openttd-build-* +/AndroidData/*.xz +/data diff --git a/project/jni/application/openttd-jgrpp/AndroidAppSettings.cfg b/project/jni/application/openttd-jgrpp/AndroidAppSettings.cfg index 5b717c73c..2effeb7c2 100644 --- a/project/jni/application/openttd-jgrpp/AndroidAppSettings.cfg +++ b/project/jni/application/openttd-jgrpp/AndroidAppSettings.cfg @@ -1,16 +1,16 @@ # The application settings for Android libSDL port # Specify application name (e.x. My Application) -AppName="OpenTTD JGR" +AppName="OpenTTD" # Specify reversed site name of application (e.x. com.mysite.myapp) -AppFullName=org.openttd.jgrpp +AppFullName=org.openttd.sdl # Application version code (integer) -AppVersionCode=022179 +AppVersionCode=18076 # Application user-visible version name (string) -AppVersionName="0.22.1.79" +AppVersionName="1.8.0.76" # Specify path to download application data in zip archive in the form 'Description|URL|MirrorURL^Description2|URL2|MirrorURL2^...' # If you'll start Description with '!' symbol it will be enabled by default, other downloads should be selected by user from startup config menu @@ -18,7 +18,7 @@ AppVersionName="0.22.1.79" # If the URL does not contain 'http://' it is treated as file from 'project/jni/application/src/AndroidData' dir - # these files are put inside .apk package by build system # You can specify Google Play expansion files in the form 'obb:main.12345' or 'obb:patch.12345' where 12345 is the app version, first associated with the file -AppDataDownloadUrl="!!Data files - 20 Mb|openttd-data-1.7.1-7.zip.xz^!!Config file|:.openttd/openttd.cfg:openttd-1.4.0.30.cfg^!!MIDI music support (18 Mb)|timidity.zip.xz|http://sourceforge.net/projects/libsdl-android/files/timidity.zip.xz^!!Internationalization files|icudt59l.zip.xz|http://sourceforge.net/projects/libsdl-android/files/icudt59l.zip.xz^HD graphics (optional) - 220 Mb download|http://sourceforge.net/projects/libsdl-android/files/OpenTTD/abase-0.1.2-0.zip.xz/download|http://sourceforge.net/projects/libsdl-android/files/OpenTTD/zBase-v5588.zip.xz/download" +AppDataDownloadUrl="!!Data files - 20 Mb|openttd-data-1.8.0-0.zip.xz^!!Config file|:.openttd/openttd.cfg:openttd-1.4.0.30.cfg^!!MIDI music support (18 Mb)|timidity.zip.xz|http://sourceforge.net/projects/libsdl-android/files/timidity.zip.xz^!!Internationalization files|icudt59l.zip.xz|http://sourceforge.net/projects/libsdl-android/files/icudt59l.zip.xz" # Reset SDL config when updating application to the new version (y) / (n) ResetSdlConfigForThisVersion=y @@ -224,7 +224,7 @@ TouchscreenKeysTheme=2 RedefinedKeysGamepad="LALT RETURN KP_PLUS KP_MINUS MOUSE_RIGHT MOUSE_LEFT SPACE MOUSE_RIGHT DELETE MOUSE_LEFT" # How long to show startup menu button, in msec, 0 to disable startup menu -StartupMenuButtonTimeout=3000 +StartupMenuButtonTimeout=1000 # Menu items to hide from startup menu, available menu items: # SettingsMenu.OkButton SettingsMenu.DummyMenu SettingsMenu.MainMenu SettingsMenuMisc.DownloadConfig SettingsMenuMisc.OptionalDownloadConfig SettingsMenuMisc.AudioConfig SettingsMenuMisc.VideoSettingsConfig SettingsMenuMisc.ShowReadme SettingsMenuMisc.GyroscopeCalibration SettingsMenuMisc.CommandlineConfig SettingsMenuMisc.ResetToDefaultsConfig SettingsMenuMouse.MouseConfigMainMenu SettingsMenuMouse.DisplaySizeConfig SettingsMenuMouse.LeftClickConfig SettingsMenuMouse.RightClickConfig SettingsMenuMouse.AdditionalMouseConfig SettingsMenuMouse.JoystickMouseConfig SettingsMenuMouse.TouchPressureMeasurementTool SettingsMenuMouse.CalibrateTouchscreenMenu SettingsMenuKeyboard.KeyboardConfigMainMenu SettingsMenuKeyboard.ScreenKeyboardSizeConfig SettingsMenuKeyboard.ScreenKeyboardDrawSizeConfig SettingsMenuKeyboard.ScreenKeyboardThemeConfig SettingsMenuKeyboard.ScreenKeyboardTransparencyConfig SettingsMenuKeyboard.RemapHwKeysConfig SettingsMenuKeyboard.RemapScreenKbConfig SettingsMenuKeyboard.ScreenGesturesConfig SettingsMenuKeyboard.CustomizeScreenKbLayout SettingsMenuKeyboard.ScreenKeyboardAdvanced @@ -234,7 +234,7 @@ HiddenMenuOptions='SettingsMenuMouse.DisplaySizeConfig' # new SettingsMenuMisc.ShowReadme(), (AppUsesMouse \&\& \! ForceRelativeMouseMode \? new SettingsMenuMouse.DisplaySizeConfig(true) : new SettingsMenu.DummyMenu()), new SettingsMenuMisc.OptionalDownloadConfig(true), new SettingsMenuMisc.GyroscopeCalibration() # Available menu items: # SettingsMenu.OkButton SettingsMenu.DummyMenu SettingsMenu.MainMenu SettingsMenuMisc.DownloadConfig SettingsMenuMisc.OptionalDownloadConfig SettingsMenuMisc.AudioConfig SettingsMenuMisc.VideoSettingsConfig SettingsMenuMisc.ShowReadme SettingsMenuMisc.GyroscopeCalibration SettingsMenuMisc.CommandlineConfig SettingsMenuMisc.ResetToDefaultsConfig SettingsMenuMouse.MouseConfigMainMenu SettingsMenuMouse.DisplaySizeConfig SettingsMenuMouse.LeftClickConfig SettingsMenuMouse.RightClickConfig SettingsMenuMouse.AdditionalMouseConfig SettingsMenuMouse.JoystickMouseConfig SettingsMenuMouse.TouchPressureMeasurementTool SettingsMenuMouse.CalibrateTouchscreenMenu SettingsMenuKeyboard.KeyboardConfigMainMenu SettingsMenuKeyboard.ScreenKeyboardSizeConfig SettingsMenuKeyboard.ScreenKeyboardDrawSizeConfig SettingsMenuKeyboard.ScreenKeyboardThemeConfig SettingsMenuKeyboard.ScreenKeyboardTransparencyConfig SettingsMenuKeyboard.RemapHwKeysConfig SettingsMenuKeyboard.RemapScreenKbConfig SettingsMenuKeyboard.ScreenGesturesConfig SettingsMenuKeyboard.CustomizeScreenKbLayout SettingsMenuKeyboard.ScreenKeyboardAdvanced -FirstStartMenuOptions='SettingsMenu.DummyMenu' +FirstStartMenuOptions='' # SettingsMenuMisc.ShowReadme # Minimum amount of RAM application requires, in Mb, SDL will print warning to user if it's lower AppMinimumRAM=0 @@ -243,8 +243,8 @@ AppMinimumRAM=0 NDK_TOOLCHAIN_VERSION=clang # Specify architectures to compile, 'all' or 'y' to compile for all architectures. -# Available architectures: armeabi armeabi-v7a x86 mips arm64-v8a x86_64 -MultiABI='armeabi-v7a arm64-v8a x86 x86_64' +# Available architectures: armeabi-v7a x86 arm64-v8a x86_64 +MultiABI='armeabi-v7a x86 arm64-v8a x86_64' # Optional shared libraries to compile - removing some of them will save space # MP3 support by libMAD is encumbered by patents and libMAD is GPL-ed @@ -286,5 +286,5 @@ AdmobTestDeviceId= AdmobBannerSize= # Google Play Game Services application ID, required for cloud saves to work -GooglePlayGameServicesId=221074695134 +GooglePlayGameServicesId=942284197278 diff --git a/project/jni/application/openttd-jgrpp/AndroidBuild.sh b/project/jni/application/openttd-jgrpp/AndroidBuild.sh index ab310ef29..46708442c 100755 --- a/project/jni/application/openttd-jgrpp/AndroidBuild.sh +++ b/project/jni/application/openttd-jgrpp/AndroidBuild.sh @@ -13,21 +13,18 @@ CPU_TYPE=32 [ "$ARCH" = "x86_64" ] && CPU_TYPE=64 [ -e openttd-$VER-$1/objs/lang/english.lng ] || { - sh -c "cd openttd-$VER-$1 && ../src/configure --without-freetype --without-png --without-zlib --without-lzo2 --without-lzma --endian=LE --cpu-type=$CPU_TYPE && make lang && make -C objs/release endian_target.h depend && make -C objs/setting" || exit 1 + sh -c "cd openttd-$VER-$1 && ../src/configure --without-freetype --without-png --without-zlib --without-lzo2 --without-lzma --cpu-type=$CPU_TYPE && make lang && make -C objs/release endian_target.h depend && make -C objs/setting" || exit 1 rm -f openttd-$VER-$1/Makefile } || exit 1 [ -e openttd-$VER-$1/Makefile ] || { rm -f src/src/rev.cpp env PATH=$LOCAL_PATH/..:$PATH \ - 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='pkg-config libtimidity' --with-lzo2=$LOCAL_PATH/../../../obj/local/$ARCH/liblzo2.so --prefix-dir='.' --data-dir='' --without-allegro --with-fontconfig --with-lzma --endian=LE --cpu-type=$CPU_TYPE" + 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='pkg-config libtimidity' --with-lzo2=$LOCAL_PATH/../../../obj/local/$ARCH/liblzo2.so --prefix-dir='.' --data-dir='' --without-allegro --with-fontconfig --with-lzma --cpu-type=$CPU_TYPE" } || exit 1 NCPU=4 uname -s | grep -i "linux" > /dev/null && NCPU=`cat /proc/cpuinfo | grep -c -i processor` -# clang arm hack -LIBATOMIC= -echo $1 | grep 'armeabi-v7a' && LIBATOMIC="-lunwind" +env CLANG=1 ../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 $LDFLAGS"' && cp -f openttd-$VER-$1/objs/release/openttd libapplication-$1.so || exit 1 -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 -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 diff --git a/project/jni/application/openttd-jgrpp/build-pc.sh b/project/jni/application/openttd-jgrpp/build-pc.sh index 7241931df..3eeb0d9bd 100755 --- a/project/jni/application/openttd-jgrpp/build-pc.sh +++ b/project/jni/application/openttd-jgrpp/build-pc.sh @@ -5,22 +5,23 @@ LOCAL_PATH=`cd $LOCAL_PATH && pwd` mkdir -p openttd-pc openttd-pc/baseset cd openttd-pc +ln -s ../src/src . [ -e bin/baseset ] || cp -a ../src/bin ./ [ -e bin/fonts ] || cp -a ../data/fonts bin/ export CFLAGS=-O0 export CXXFLAGS=-O0 -[ -e Makefile ] || ../src/configure --enable-debug --cpu-type=64 || exit 1 +[ -e Makefile ] || ../src/configure --enable-debug || exit 1 make -j8 VERBOSE=1 || exit 1 cd bin export LD_LIBRARY_PATH=/usr/local/lib if [ -z "$1" ]; then - ./openttd -d 2 -r 854x480 -b 16bpp-simple # -g opntitle.sav + ./openttd -d 2 -r 854x480 -g opntitle.sav else - #valgrind --track-fds=yes --log-file=valgrind.log --leak-check=full --read-var-info=yes \ + #valgrind --track-fds=yes --log-file=valgrind.log --leak-check=full \ gdb -ex run --args \ - ./openttd -d 2 -r 854x480 -b 16bpp-simple # -g opntitle.sav + ./openttd -d 2 -r 854x480 -g opntitle.sav fi diff --git a/project/jni/application/openttd-jgrpp/pack-data.sh b/project/jni/application/openttd-jgrpp/pack-data.sh index 01f0db51c..a23ab79e5 100755 --- a/project/jni/application/openttd-jgrpp/pack-data.sh +++ b/project/jni/application/openttd-jgrpp/pack-data.sh @@ -1,6 +1,6 @@ #!/bin/sh -VER=1.7.1-7 +VER=0.25.2-0 cd data rm -f ../AndroidData/openttd-data-*.zip.xz ../AndroidData/openttd-data-*.zip diff --git a/project/jni/application/openttd-jgrpp/readme.txt b/project/jni/application/openttd-jgrpp/readme.txt index 2221ff946..9b011ea13 100644 --- a/project/jni/application/openttd-jgrpp/readme.txt +++ b/project/jni/application/openttd-jgrpp/readme.txt @@ -2,8 +2,6 @@ Quick compilation guide: Install liblzma-dev, it's needed for configure script sudo apt-get install liblzma-dev Download my Git repo from https://github.com/pelya/commandergenius, -then install Android SDK, Android NDK, and "ant" tool, then launch commands +then install Android SDK, Android NDK, then launch commands git submodule update --init --recursive build.sh openttd-jgrpp -You may need to run command - android update project -p project -t android-25 diff --git a/project/jni/application/openttd-jgrpp/reunpack-data-device.sh b/project/jni/application/openttd-jgrpp/reunpack-data-device.sh deleted file mode 100755 index 09d8222d3..000000000 --- a/project/jni/application/openttd-jgrpp/reunpack-data-device.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -adb shell rm /mnt/shell/emulated/0/Android/data/org.openttd.sdl/files/libsdl-DownloadFinished-0.flag -adb shell rm /mnt/shell/emulated/0/Android/data/org.openttd.sdl/files/libsdl-DownloadFinished-1.flag diff --git a/project/jni/application/openttd-jgrpp/src b/project/jni/application/openttd-jgrpp/src index 46cc53c3f..d696a6204 160000 --- a/project/jni/application/openttd-jgrpp/src +++ b/project/jni/application/openttd-jgrpp/src @@ -1 +1 @@ -Subproject commit 46cc53c3fe3e9d878eb9076911f60c9ea77e0abc +Subproject commit d696a620498d52f462c8b916ba77b7b2799e29a2