Updated OpenTTD project

pelya · Jun 3, 2011 · 935f1fc · 935f1fc
1 parent eb897e2
commit 935f1fc
Show file tree

Hide file tree

Showing 17 changed files with 20 additions and 359 deletions.
diff --git a/project/jni/application/openttd-chillcore/AndroidAppSettings.cfg b/project/jni/application/openttd-chillcore/AndroidAppSettings.cfg
diff --git a/project/jni/application/openttd-chillcore/AndroidBuild.sh b/project/jni/application/openttd-chillcore/AndroidBuild.sh
diff --git a/project/jni/application/openttd-chillcore/icon.png b/project/jni/application/openttd-chillcore/icon.png
diff --git a/project/jni/application/openttd-chillcore/openttd b/project/jni/application/openttd-chillcore/openttd
diff --git a/project/jni/application/openttd-chillcore/openttd-trunk-android.patch b/project/jni/application/openttd-chillcore/openttd-trunk-android.patch
diff --git a/project/jni/application/openttd-chillcore/readme.txt b/project/jni/application/openttd-chillcore/readme.txt
diff --git a/project/jni/application/openttd-lowmem/AndroidAppSettings.cfg b/project/jni/application/openttd-lowmem/AndroidAppSettings.cfg
diff --git a/project/jni/application/openttd-lowmem/AndroidBuild.sh b/project/jni/application/openttd-lowmem/AndroidBuild.sh
diff --git a/project/jni/application/openttd-lowmem/icon.png b/project/jni/application/openttd-lowmem/icon.png
diff --git a/project/jni/application/openttd-lowmem/openttd b/project/jni/application/openttd-lowmem/openttd
diff --git a/project/jni/application/openttd-lowmem/readme.txt b/project/jni/application/openttd-lowmem/readme.txt
diff --git a/project/jni/application/openttd/AndroidAppSettings.cfg b/project/jni/application/openttd/AndroidAppSettings.cfg
@@ -5,7 +5,7 @@ AppName="OpenTTD"
 AppFullName=org.openttd.sdl
 ScreenOrientation=h
 InhibitSuspend=n
-AppDataDownloadUrl="Data files - 20 Mb|http://sourceforge.net/projects/libsdl-android/files/OpenTTD/openttd-data-5.zip/download^MIDI music support (18 Mb)|http://sourceforge.net/projects/libsdl-android/files/timidity.zip/download^Big GUI add-on - enable it in NewGRF Settings|:data/opengfx+biggui.grf:http://www.tt-forums.net/download/file.php?id=135095"
+AppDataDownloadUrl="!Data files - 20 Mb|http://sourceforge.net/projects/libsdl-android/files/OpenTTD/openttd-data-6.zip/download^!MIDI music support (18 Mb)|http://sourceforge.net/projects/libsdl-android/files/timidity.zip/download^!Big GUI add-on - enable it in NewGRF Settings|:data/opengfx+biggui.grf:http://www.tt-forums.net/download/file.php?id=135095"
 SdlVideoResize=y
 SdlVideoResizeKeepAspect=n
 NeedDepthBuffer=n
@@ -22,9 +22,11 @@ RedefinedKeys="LALT RETURN KP_PLUS KP_MINUS SPACE DELETE"
 AppTouchscreenKeyboardKeysAmount=0
 AppTouchscreenKeyboardKeysAmountAutoFire=0
 RedefinedKeysScreenKb="LALT RETURN KP_PLUS KP_MINUS SPACE DELETE KP_PLUS KP_MINUS 1 2"
+StartupMenuButtonTimeout=3000
+HiddenMenuOptions='KeyboardConfigMainMenu AudioConfig'
 MultiABI=n
-AppVersionCode=11013
-AppVersionName="1.1.0.13"
+AppVersionCode=11113
+AppVersionName="1.1.1.13"
 CompiledLibraries="jpeg png freetype timidity lzma lzo2"
 CustomBuildScript=y
 AppCflags=''

diff --git a/project/jni/application/openttd/AndroidBuild.sh b/project/jni/application/openttd/AndroidBuild.sh
@@ -16,6 +16,6 @@ if [ \! -f openttd/objs/lang/english.lng ] ; then
 fi
 
 if [ \! -f openttd/Makefile ] ; then
-	../setEnvironment.sh sh -c "cd openttd && ./configure --host=arm-eabi --with-sdl --with-freetype=sdl-config --with-png --with-zlib --with-libtimidity=$LOCAL_PATH/../../../obj/local/armeabi/libtimidity.so --with-lzo2=$LOCAL_PATH/../../../obj/local/armeabi/liblzo2.so --prefix-dir='.' --data-dir='' --without-allegro --without-fontconfig --endian=LE"
+	../setEnvironment.sh sh -c "cd openttd && ./configure --host=arm-eabi --with-sdl --with-freetype=sdl-config --with-png --with-zlib --without-icu --with-libtimidity=$LOCAL_PATH/../../../obj/local/armeabi/libtimidity.so --with-lzo2=$LOCAL_PATH/../../../obj/local/armeabi/liblzo2.so --prefix-dir='.' --data-dir='' --without-allegro --without-fontconfig --endian=LE"
 fi
 ../setEnvironment.sh sh -c "cd openttd && make -j1 VERBOSE=1 STRIP='' LIBS='-lsdl-1.2 -llzo2 -lpng -ltimidity -lfreetype -lgcc -lz -lc -lstdc++'" && cp -f openttd/objs/release/openttd libapplication.so
diff --git a/project/jni/application/openttd/openttd b/project/jni/application/openttd/openttd
@@ -1 +1 @@
-../../../../../openttd-1.1.0
+../../../../../openttd-1.1.1