SDL: updated setEnvironment.sh build scriots with CLANG and NDK r16b support, ARMv5 and MIPS will be deprecated in NDK r17 so not updated

2017-12-26 17:34:46 +02:00
parent 1cf8c094a3
commit cdf1c7347d
6 changed files with 305 additions and 123 deletions
--- a/changeAppSettings.sh
+++ b/changeAppSettings.sh
@@ -1048,6 +1048,7 @@ else
 	$SEDI "s/==GOOGLEPLAYGAMESERVICES_APP_ID==/$GooglePlayGameServicesId/g" project/res/values/strings.xml

 	PROGUARD=`which android`
+	[ -z "$PROGUARD" ] && PROGUARD=$ANDROID_SDK_ROOT/tools/android
 	PROGUARD=`dirname $PROGUARD`/proguard/lib/proguard.jar
 	java -jar $PROGUARD | grep 'ProGuard, version 5.3' || {
 		echo "Error: ProGuard is too old"