From 4e9f088b3c7e8989902b17568f57ddc3b46701e8 Mon Sep 17 00:00:00 2001
From: pelya <x.pelya.x@gmail.com>
Date: Sat, 2 Apr 2016 22:32:06 +0300
Subject: [PATCH] Added fake pkg-config script to resolve include paths to SDL
 repo, fixed OpenTTD compilation

---
 .../jni/application/openttd/AndroidBuild.sh   |   3 +-
 project/jni/application/openttd/src           |   2 +-
 project/jni/application/openttd/translations  |   1 +
 project/jni/application/pkg-config            | 103 ++++++++++++++++++
 4 files changed, 107 insertions(+), 2 deletions(-)
 create mode 120000 project/jni/application/openttd/translations
 create mode 100755 project/jni/application/pkg-config

diff --git a/project/jni/application/openttd/AndroidBuild.sh b/project/jni/application/openttd/AndroidBuild.sh
index 393d3f93b..b838ff8ab 100755
--- a/project/jni/application/openttd/AndroidBuild.sh
+++ b/project/jni/application/openttd/AndroidBuild.sh
@@ -14,7 +14,8 @@ VER=build
 export ARCH=$1
 [ -e openttd-$VER-$1/Makefile ] || {
 	rm -f src/src/rev.cpp
-	../setEnvironment-$1.sh sh -c "cd openttd-$VER-$1 && env ../src/configure --host=$2 --with-sdl --with-freetype=sdl-config --with-png --with-zlib --with-icu --with-libtimidity=$LOCAL_PATH/../../../obj/local/$ARCH/libtimidity.so --with-lzo2=$LOCAL_PATH/../../../obj/local/$ARCH/liblzo2.so --prefix-dir='.' --data-dir='' --without-allegro --with-fontconfig --with-lzma --endian=LE || echo 'Run: sudo apt-get install liblzma-dev - it is needed only for configure script'"
+	env PATH=$LOCAL_PATH/..:$PATH \
+	../setEnvironment-$1.sh sh -c "cd openttd-$VER-$1 && env ../src/configure --host=$2 --with-sdl --with-freetype --with-png --with-zlib --with-icu --with-libtimidity --with-lzo2=$LOCAL_PATH/../../../obj/local/$ARCH/liblzo2.so --prefix-dir='.' --data-dir='' --without-allegro --with-fontconfig --with-lzma --endian=LE || echo 'Run: sudo apt-get install liblzma-dev - it is needed only for configure script'"
 } || exit 1
 
 NCPU=4
diff --git a/project/jni/application/openttd/src b/project/jni/application/openttd/src
index 145d01d3d..5a6f11361 160000
--- a/project/jni/application/openttd/src
+++ b/project/jni/application/openttd/src
@@ -1 +1 @@
-Subproject commit 145d01d3df58cba497a86308f3125cfe1ebe6516
+Subproject commit 5a6f11361db060f16249bee29a5a075bc0dad5d3
diff --git a/project/jni/application/openttd/translations b/project/jni/application/openttd/translations
new file mode 120000
index 000000000..461fa841c
--- /dev/null
+++ b/project/jni/application/openttd/translations
@@ -0,0 +1 @@
+../../../../../openttd-android-translate/
\ No newline at end of file
diff --git a/project/jni/application/pkg-config b/project/jni/application/pkg-config
new file mode 100755
index 000000000..174e49ac8
--- /dev/null
+++ b/project/jni/application/pkg-config
@@ -0,0 +1,103 @@
+#!/bin/sh
+
+LOCAL_PATH=`dirname $0`
+LOCAL_PATH=`cd $LOCAL_PATH && pwd`
+
+usage="\
+Usage: pkg-config package [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs] [--static-libs]"
+
+if test $# -eq 0; then
+      echo "${usage}" 1>&2
+      exit 1
+fi
+
+PKG=$(
+for ARG in "$@"; do
+    case "$ARG" in
+      -*)
+        ;;
+      *)
+        [ -z "$PKG" ] || { echo "Please specify only one package" > /dev/stderr ; exit 1 ; }
+        echo "$ARG"
+        ;;
+    esac
+done
+)
+
+[ -n "$PKG" ] || { echo "Please specify a package" > /dev/stderr ; exit 1 ; }
+
+#echo PKG IN "'""$PKG""'" > /dev/stderr
+
+case "$PKG" in
+  sdl)
+    PKG=sdl-1.2
+    ;;
+  zlib)
+    PKG=sdl-1.2
+    ;;
+  freetype2)
+    PKG=freetype
+    ;;
+  icu-*)
+    PKG=`echo $PKG | sed 's/^icu-/icu/'`
+    ;;
+  lib*)
+    PKG=`echo $PKG | sed 's/^lib//'`
+    ;;
+  *)
+    ;;
+esac
+
+#echo PKG OUT "'""$PKG""'" > /dev/stderr
+
+prefix=$LOCAL_PATH/../$PKG
+exec_prefix_set=no
+
+[ -e "${prefix}/include" ] || { echo "Package $PKG not found" > /dev/stderr ; exit 1 ; }
+
+
+while test $# -gt 0; do
+  case "$1" in
+    -*=*) optarg=`echo "$1" | LC_ALL="C" sed 's/[-_a-zA-Z0-9]*=//'` ;;
+    *) optarg= ;;
+  esac
+
+  case $1 in
+    --prefix=*)
+      prefix=$optarg
+      if test $exec_prefix_set = no ; then
+        exec_prefix=$optarg
+      fi
+      ;;
+    --prefix)
+      echo $prefix
+      ;;
+    --exec-prefix=*)
+      exec_prefix=$optarg
+      exec_prefix_set=yes
+      ;;
+    --exec-prefix)
+      echo $exec_prefix
+      ;;
+    --version)
+      echo 999.999
+      ;;
+    --modversion)
+      echo 999.999
+      ;;
+    --cflags)
+      echo -I${prefix}/include
+      ;;
+    --libs)
+      echo -l$PKG
+      ;;
+    --static-libs)
+      echo -l$PKG
+      ;;
+    *)
+      ;;
+  esac
+  shift
+done
+
+exit 0