From e0e24403ce03b3d02956fa847275faa708e3c362 Mon Sep 17 00:00:00 2001
From: pelya <x.pelya.x@gmail.com>
Date: Mon, 14 May 2012 13:50:21 +0300
Subject: [PATCH] Fixed build scripts for the case when NDK is referenced by a
 synlink

---
 build.sh                                                 | 2 +-
 project/java/Video.java                                  | 3 +++
 project/jni/application/ballfield/AndroidAppSettings.cfg | 1 +
 project/jni/application/ballfield/ballfield.cpp          | 2 +-
 project/jni/application/openttd/AndroidAppSettings.cfg   | 2 ++
 project/jni/application/openttd/openttd                  | 2 +-
 project/jni/application/setEnvironment-r4b.sh            | 2 ++
 project/jni/application/setEnvironment-r5b.sh            | 1 +
 project/jni/application/setEnvironment.sh                | 2 ++
 project/jni/application/src                              | 2 +-
 10 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/build.sh b/build.sh
index 3251b011c..0d2245927 100755
--- a/build.sh
+++ b/build.sh
@@ -28,7 +28,7 @@ rm -r -f project/bin/* # New Android SDK introduced some lame-ass optimizations
 
 cd project && env PATH=$NDKBUILDPATH nice -n19 ndk-build V=1 -j4 && \
  { grep "CustomBuildScript=y" ../AndroidAppSettings.cfg > /dev/null && \
-   [ -`which ndk-build | grep '/android-ndk-r[56789]'` != - ] && \
+   [ -`which ndk-build | xargs readlink -f | grep '/android-ndk-r[56789]'` != - ] && \
    echo Stripping libapplication.so by hand \
    rm obj/local/armeabi/libapplication.so && \
    cp jni/application/src/libapplication.so obj/local/armeabi && \
diff --git a/project/java/Video.java b/project/java/Video.java
index 8e4d51ea5..ad81a6455 100644
--- a/project/java/Video.java
+++ b/project/java/Video.java
@@ -617,6 +617,8 @@ class DemoGLSurfaceView extends GLSurfaceView_SDL {
 	// This seems like redundant code - it handled in MainActivity.java
 	@Override
 	public boolean onKeyDown(int keyCode, final KeyEvent event) {
+		//System.out.println("Got key down event, id " + keyCode);
+
 		if( nativeKey( keyCode, 1 ) == 0 )
 				return super.onKeyDown(keyCode, event);
 		return true;
@@ -624,6 +626,7 @@ class DemoGLSurfaceView extends GLSurfaceView_SDL {
 	
 	@Override
 	public boolean onKeyUp(int keyCode, final KeyEvent event) {
+		//System.out.println("Got key up event, id " + keyCode);
 		if( nativeKey( keyCode, 0 ) == 0 )
 				return super.onKeyUp(keyCode, event);
 		return true;
diff --git a/project/jni/application/ballfield/AndroidAppSettings.cfg b/project/jni/application/ballfield/AndroidAppSettings.cfg
index e43ed9476..0b424a30b 100644
--- a/project/jni/application/ballfield/AndroidAppSettings.cfg
+++ b/project/jni/application/ballfield/AndroidAppSettings.cfg
@@ -14,6 +14,7 @@ SwVideoMode=y
 SdlVideoResize=y
 SdlVideoResizeKeepAspect=n
 CompatibilityHacks=n
+CompatibilityHacksStaticInit=n
 AppUsesMouse=y
 AppNeedsTwoButtonMouse=y
 ShowMouseCursor=n
diff --git a/project/jni/application/ballfield/ballfield.cpp b/project/jni/application/ballfield/ballfield.cpp
index 8509dd0fe..a6f9e3877 100644
--- a/project/jni/application/ballfield/ballfield.cpp
+++ b/project/jni/application/ballfield/ballfield.cpp
@@ -582,8 +582,8 @@ int main(int argc, char* argv[])
 			unaligned_test(ptr, &val4);
 */
 		}
-/*
 		print_num(screen, font, screen->w-37, screen->h-12, fps);
+/*
 		print_num_hex(screen, font_hex, 0, 40, val0);
 		print_num_hex(screen, font_hex, 0, 60, val1);
 		print_num_hex(screen, font_hex, 0, 80, val2);
diff --git a/project/jni/application/openttd/AndroidAppSettings.cfg b/project/jni/application/openttd/AndroidAppSettings.cfg
index 6b143b651..25b837629 100644
--- a/project/jni/application/openttd/AndroidAppSettings.cfg
+++ b/project/jni/application/openttd/AndroidAppSettings.cfg
@@ -14,6 +14,7 @@ SwVideoMode=y
 SdlVideoResize=y
 SdlVideoResizeKeepAspect=n
 CompatibilityHacks=n
+CompatibilityHacksStaticInit=n
 AppUsesMouse=y
 AppNeedsTwoButtonMouse=y
 ShowMouseCursor=n
@@ -35,6 +36,7 @@ MultiABI=n
 AppVersionCode=11415
 AppVersionName="1.1.4.15"
 ResetSdlConfigForThisVersion=n
+DeleteFilesOnUpgrade="%"
 CompiledLibraries="jpeg png freetype timidity lzma lzo2"
 CustomBuildScript=y
 AppCflags=''
diff --git a/project/jni/application/openttd/openttd b/project/jni/application/openttd/openttd
index 10132ca7f..04831cbb8 120000
--- a/project/jni/application/openttd/openttd
+++ b/project/jni/application/openttd/openttd
@@ -1 +1 @@
-../../../../../openttd-1.1.4
\ No newline at end of file
+../../../../../openttd-1.2.0
\ No newline at end of file
diff --git a/project/jni/application/setEnvironment-r4b.sh b/project/jni/application/setEnvironment-r4b.sh
index 6f2bad9c3..0bd509ab6 100755
--- a/project/jni/application/setEnvironment-r4b.sh
+++ b/project/jni/application/setEnvironment-r4b.sh
@@ -16,6 +16,8 @@ fi
 
 NDK=`which ndk-build`
 NDK=`dirname $NDK`
+NDK=`readlink -f $NDK`
+
 GCCVER=4.4.0
 PLATFORMVER=android-8
 LOCAL_PATH=`dirname $0`
diff --git a/project/jni/application/setEnvironment-r5b.sh b/project/jni/application/setEnvironment-r5b.sh
index fff3ff97e..ce3d85a6b 100755
--- a/project/jni/application/setEnvironment-r5b.sh
+++ b/project/jni/application/setEnvironment-r5b.sh
@@ -16,6 +16,7 @@ fi
 
 NDK=`which ndk-build`
 NDK=`dirname $NDK`
+NDK=`readlink -f $NDK`
 
 #echo NDK $NDK
 GCCPREFIX=arm-linux-androideabi
diff --git a/project/jni/application/setEnvironment.sh b/project/jni/application/setEnvironment.sh
index 9e064f8c2..d695a9f97 100755
--- a/project/jni/application/setEnvironment.sh
+++ b/project/jni/application/setEnvironment.sh
@@ -9,6 +9,8 @@ IFS='
 
 NDK=`which ndk-build`
 NDK=`dirname $NDK`
+NDK=`readlink -f $NDK`
+
 LOCAL_PATH=`dirname $0`
 LOCAL_PATH=`cd $LOCAL_PATH && pwd`
 
diff --git a/project/jni/application/src b/project/jni/application/src
index 9cdf4a8cf..550b7b622 120000
--- a/project/jni/application/src
+++ b/project/jni/application/src
@@ -1 +1 @@
-milkytracker
\ No newline at end of file
+openttd
\ No newline at end of file