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

---
 project/jni/application/setEnvironment-arm64-v8a.sh   | 6 ++++--
 project/jni/application/setEnvironment-armeabi-v7a.sh | 6 ++++--
 project/jni/application/setEnvironment-x86.sh         | 6 ++++--
 project/jni/application/setEnvironment-x86_64.sh      | 6 ++++--
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/project/jni/application/setEnvironment-arm64-v8a.sh b/project/jni/application/setEnvironment-arm64-v8a.sh
index 8ad256938..d3422906d 100755
--- a/project/jni/application/setEnvironment-arm64-v8a.sh
+++ b/project/jni/application/setEnvironment-arm64-v8a.sh
@@ -31,11 +31,13 @@ fi
 ARCH=arm64-v8a
 
 APP_MODULES=`grep 'APP_MODULES [:][=]' $LOCAL_PATH/../Settings.mk | sed 's@.*[=]\(.*\)@\1@'`
+
 APP_AVAILABLE_STATIC_LIBS="`echo '
-include $LOCAL_PATH/../Settings.mk
+include $(LOCAL_PATH)/../Settings.mk
 all:
 	@echo $(APP_AVAILABLE_STATIC_LIBS)
-.PHONY: all' | make -s -f -`"
+.PHONY: all' | make LOCAL_PATH=$LOCAL_PATH -s -f -`"
+
 APP_SHARED_LIBS=$(
 echo $APP_MODULES | xargs -n 1 echo | while read LIB ; do
 	STATIC=`echo $APP_AVAILABLE_STATIC_LIBS application sdl_main stlport stdout-test | grep "\\\\b$LIB\\\\b"`
diff --git a/project/jni/application/setEnvironment-armeabi-v7a.sh b/project/jni/application/setEnvironment-armeabi-v7a.sh
index dc917c845..1eba997ed 100755
--- a/project/jni/application/setEnvironment-armeabi-v7a.sh
+++ b/project/jni/application/setEnvironment-armeabi-v7a.sh
@@ -31,11 +31,13 @@ fi
 ARCH=armeabi-v7a
 
 APP_MODULES=`grep 'APP_MODULES [:][=]' $LOCAL_PATH/../Settings.mk | sed 's@.*[=]\(.*\)@\1@'`
+
 APP_AVAILABLE_STATIC_LIBS="`echo '
-include $LOCAL_PATH/../Settings.mk
+include $(LOCAL_PATH)/../Settings.mk
 all:
 	@echo $(APP_AVAILABLE_STATIC_LIBS)
-.PHONY: all' | make -s -f -`"
+.PHONY: all' | make LOCAL_PATH=$LOCAL_PATH -s -f -`"
+
 APP_SHARED_LIBS=$(
 echo $APP_MODULES | xargs -n 1 echo | while read LIB ; do
 	STATIC=`echo $APP_AVAILABLE_STATIC_LIBS application sdl_main stlport stdout-test | grep "\\\\b$LIB\\\\b"`
diff --git a/project/jni/application/setEnvironment-x86.sh b/project/jni/application/setEnvironment-x86.sh
index b2e1a46e0..7732bdc63 100755
--- a/project/jni/application/setEnvironment-x86.sh
+++ b/project/jni/application/setEnvironment-x86.sh
@@ -31,11 +31,13 @@ fi
 ARCH=x86
 
 APP_MODULES=`grep 'APP_MODULES [:][=]' $LOCAL_PATH/../Settings.mk | sed 's@.*[=]\(.*\)@\1@'`
+
 APP_AVAILABLE_STATIC_LIBS="`echo '
-include $LOCAL_PATH/../Settings.mk
+include $(LOCAL_PATH)/../Settings.mk
 all:
 	@echo $(APP_AVAILABLE_STATIC_LIBS)
-.PHONY: all' | make -s -f -`"
+.PHONY: all' | make LOCAL_PATH=$LOCAL_PATH -s -f -`"
+
 APP_SHARED_LIBS=$(
 echo $APP_MODULES | xargs -n 1 echo | while read LIB ; do
 	STATIC=`echo $APP_AVAILABLE_STATIC_LIBS application sdl_main stlport stdout-test | grep "\\\\b$LIB\\\\b"`
diff --git a/project/jni/application/setEnvironment-x86_64.sh b/project/jni/application/setEnvironment-x86_64.sh
index 6f857754a..1b3ed03f1 100755
--- a/project/jni/application/setEnvironment-x86_64.sh
+++ b/project/jni/application/setEnvironment-x86_64.sh
@@ -31,11 +31,13 @@ fi
 ARCH=x86_64
 
 APP_MODULES=`grep 'APP_MODULES [:][=]' $LOCAL_PATH/../Settings.mk | sed 's@.*[=]\(.*\)@\1@'`
+
 APP_AVAILABLE_STATIC_LIBS="`echo '
-include $LOCAL_PATH/../Settings.mk
+include $(LOCAL_PATH)/../Settings.mk
 all:
 	@echo $(APP_AVAILABLE_STATIC_LIBS)
-.PHONY: all' | make -s -f -`"
+.PHONY: all' | make LOCAL_PATH=$LOCAL_PATH -s -f -`"
+
 APP_SHARED_LIBS=$(
 echo $APP_MODULES | xargs -n 1 echo | while read LIB ; do
 	STATIC=`echo $APP_AVAILABLE_STATIC_LIBS application sdl_main stlport stdout-test | grep "\\\\b$LIB\\\\b"`