From 33623855a898cb169b6490368692dd7c0ad66f1c Mon Sep 17 00:00:00 2001
From: pelya <x.pelya.x@gmail.com>
Date: Mon, 27 Jun 2016 01:52:43 +0300
Subject: [PATCH] OpenArena: show SD card permission dialog when extracting
 data from .obb file

---
 .../jni/application/openarena/AndroidBuild.sh |  1 +
 project/jni/application/openarena/engine      |  2 +-
 project/jni/application/openarena/vm          |  2 +-
 project/jni/application/pkg-config            | 20 ++++++++++++++-----
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/project/jni/application/openarena/AndroidBuild.sh b/project/jni/application/openarena/AndroidBuild.sh
index d9068af31..21a71c74c 100755
--- a/project/jni/application/openarena/AndroidBuild.sh
+++ b/project/jni/application/openarena/AndroidBuild.sh
@@ -21,6 +21,7 @@ env NO_SHARED_LIBS=1 V=1 ../setEnvironment-$1.sh make -C vm -j8 PLATFORM=android
 # Do not generate shared game logic libs - QVM files are used instead
 # ../setEnvironment-armeabi.sh sh -c "cd vm/build/release-android-$1/baseq3 && \$STRIP --strip-unneeded *.so && zip ../../../../AndroidData/binaries.zip *.so"
 
+env PATH=`pwd`/..:$PATH \
 ../setEnvironment-$1.sh make -j8 -C engine release \
 PLATFORM=android ARCH=$1 USE_GLES=1 USE_LOCAL_HEADERS=0 BUILD_CLIENT_SMP=0 \
 USE_OPENAL=1 USE_OPENAL_DLOPEN=0 USE_VOIP=1 USE_CURL=1 USE_CURL_DLOPEN=0 USE_CODEC_VORBIS=1 USE_MUMBLE=0 USE_FREETYPE=1 \
diff --git a/project/jni/application/openarena/engine b/project/jni/application/openarena/engine
index 35b97d2c9..9c91a7bd6 160000
--- a/project/jni/application/openarena/engine
+++ b/project/jni/application/openarena/engine
@@ -1 +1 @@
-Subproject commit 35b97d2c9eb9306dc73d234aa25e70b68c4e74ab
+Subproject commit 9c91a7bd694ccd05f74cd4dfb72991aa93526a30
diff --git a/project/jni/application/openarena/vm b/project/jni/application/openarena/vm
index 67598fad8..ed024e7fc 160000
--- a/project/jni/application/openarena/vm
+++ b/project/jni/application/openarena/vm
@@ -1 +1 @@
-Subproject commit 67598fad8d277f4f5f3c68507af93860bbe52e4f
+Subproject commit ed024e7fcf04b0345c3ff861fa6c8f11a2f3a912
diff --git a/project/jni/application/pkg-config b/project/jni/application/pkg-config
index 174e49ac8..3662fd779 100755
--- a/project/jni/application/pkg-config
+++ b/project/jni/application/pkg-config
@@ -88,11 +88,21 @@ while test $# -gt 0; do
     --cflags)
       echo -I${prefix}/include
       ;;
-    --libs)
-      echo -l$PKG
-      ;;
-    --static-libs)
-      echo -l$PKG
+    --libs|--static-libs)
+      case $PKG in
+        curl|libcurl)
+          echo -lcurl-sdl -l:libssl.so.sdl.0.so -l:libcrypto.so.sdl.0.so
+          ;;
+        crypto|libcrypto)
+          echo -l:libcrypto.so.sdl.0.so
+          ;;
+        openssl|ssl|libssl)
+          echo -l:libssl.so.sdl.0.so -l:libcrypto.so.sdl.0.so
+          ;;
+        *)
+          echo -l$PKG
+          ;;
+      esac
       ;;
     *)
       ;;