From a67e53fe489d7e607ac413c558dcd634b1001702 Mon Sep 17 00:00:00 2001
From: Sergii Pylypenko <x.pelya.x@gmail.com>
Date: Tue, 26 Dec 2017 18:09:40 +0200
Subject: [PATCH] SDL: yet more fixes to setEnvironment.sh scripts

---
 project/jni/application/setEnvironment-arm64-v8a.sh   | 3 +++
 project/jni/application/setEnvironment-armeabi-v7a.sh | 3 +++
 project/jni/application/setEnvironment-x86.sh         | 3 +++
 project/jni/application/setEnvironment-x86_64.sh      | 3 +++
 4 files changed, 12 insertions(+)

diff --git a/project/jni/application/setEnvironment-arm64-v8a.sh b/project/jni/application/setEnvironment-arm64-v8a.sh
index d3422906d..44c36ce67 100755
--- a/project/jni/application/setEnvironment-arm64-v8a.sh
+++ b/project/jni/application/setEnvironment-arm64-v8a.sh
@@ -143,6 +143,9 @@ LDFLAGS="
 $SHARED $UNRESOLVED
 -L$LOCAL_PATH/../../obj/local/$ARCH
 $APP_SHARED_LIBS
+-L$NDK/sources/cxx-stl/llvm-libc++/libs/$ARCH
+-L$NDK/sources/cxx-stl/llvm-libc++abi/../llvm-libc++/libs/$ARCH
+-L$NDK/sources/android/support/../../cxx-stl/llvm-libc++/libs/$ARCH
 $NDK/sources/cxx-stl/llvm-libc++/libs/$ARCH/libc++_static.a
 $NDK/sources/cxx-stl/llvm-libc++abi/../llvm-libc++/libs/$ARCH/libc++abi.a
 $NDK/sources/android/support/../../cxx-stl/llvm-libc++/libs/$ARCH/libandroid_support.a
diff --git a/project/jni/application/setEnvironment-armeabi-v7a.sh b/project/jni/application/setEnvironment-armeabi-v7a.sh
index 1eba997ed..3c4c40d02 100755
--- a/project/jni/application/setEnvironment-armeabi-v7a.sh
+++ b/project/jni/application/setEnvironment-armeabi-v7a.sh
@@ -148,6 +148,9 @@ LDFLAGS="
 $SHARED $UNRESOLVED
 -L$LOCAL_PATH/../../obj/local/$ARCH
 $APP_SHARED_LIBS
+-L$NDK/sources/cxx-stl/llvm-libc++/libs/$ARCH
+-L$NDK/sources/cxx-stl/llvm-libc++abi/../llvm-libc++/libs/$ARCH
+-L$NDK/sources/android/support/../../cxx-stl/llvm-libc++/libs/$ARCH
 $NDK/sources/cxx-stl/llvm-libc++/libs/$ARCH/libc++_static.a
 $NDK/sources/cxx-stl/llvm-libc++abi/../llvm-libc++/libs/$ARCH/libc++abi.a
 $NDK/sources/android/support/../../cxx-stl/llvm-libc++/libs/$ARCH/libandroid_support.a
diff --git a/project/jni/application/setEnvironment-x86.sh b/project/jni/application/setEnvironment-x86.sh
index 7732bdc63..1319aca0e 100755
--- a/project/jni/application/setEnvironment-x86.sh
+++ b/project/jni/application/setEnvironment-x86.sh
@@ -144,6 +144,9 @@ LDFLAGS="
 $SHARED $UNRESOLVED
 -L$LOCAL_PATH/../../obj/local/$ARCH
 $APP_SHARED_LIBS
+-L$NDK/sources/cxx-stl/llvm-libc++/libs/$ARCH
+-L$NDK/sources/cxx-stl/llvm-libc++abi/../llvm-libc++/libs/$ARCH
+-L$NDK/sources/android/support/../../cxx-stl/llvm-libc++/libs/$ARCH
 $NDK/sources/cxx-stl/llvm-libc++/libs/$ARCH/libc++_static.a
 $NDK/sources/cxx-stl/llvm-libc++abi/../llvm-libc++/libs/$ARCH/libc++abi.a
 $NDK/sources/android/support/../../cxx-stl/llvm-libc++/libs/$ARCH/libandroid_support.a
diff --git a/project/jni/application/setEnvironment-x86_64.sh b/project/jni/application/setEnvironment-x86_64.sh
index 1b3ed03f1..0d776e440 100755
--- a/project/jni/application/setEnvironment-x86_64.sh
+++ b/project/jni/application/setEnvironment-x86_64.sh
@@ -143,6 +143,9 @@ LDFLAGS="
 $SHARED $UNRESOLVED
 -L$LOCAL_PATH/../../obj/local/$ARCH
 $APP_SHARED_LIBS
+-L$NDK/sources/cxx-stl/llvm-libc++/libs/$ARCH
+-L$NDK/sources/cxx-stl/llvm-libc++abi/../llvm-libc++/libs/$ARCH
+-L$NDK/sources/android/support/../../cxx-stl/llvm-libc++/libs/$ARCH
 $NDK/sources/cxx-stl/llvm-libc++/libs/$ARCH/libc++_static.a
 $NDK/sources/cxx-stl/llvm-libc++abi/../llvm-libc++/libs/$ARCH/libc++abi.a
 $NDK/sources/android/support/../../cxx-stl/llvm-libc++/libs/$ARCH/libandroid_support.a