From 2aa6ae455c1740475a7d76677619aa4347bbbbba Mon Sep 17 00:00:00 2001 From: pelya Date: Fri, 1 Jan 2021 02:43:29 +0200 Subject: [PATCH] SDL: do not add include dirs for c++shared and libapplication.so libs in setEnvironment.sh scripts --- project/jni/application/setEnvironment-arm64-v8a.sh | 2 +- project/jni/application/setEnvironment-armeabi-v7a.sh | 2 +- project/jni/application/setEnvironment-x86.sh | 2 +- project/jni/application/setEnvironment-x86_64.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/project/jni/application/setEnvironment-arm64-v8a.sh b/project/jni/application/setEnvironment-arm64-v8a.sh index ca92a00a5..1a1e89714 100755 --- a/project/jni/application/setEnvironment-arm64-v8a.sh +++ b/project/jni/application/setEnvironment-arm64-v8a.sh @@ -63,7 +63,7 @@ if [ -n "$NO_SHARED_LIBS" ]; then fi APP_SHARED_LIBS="`echo $APP_SHARED_LIBS | sed \"s@\([-a-zA-Z0-9_.]\+\)@$LOCAL_PATH/../../obj/local/$ARCH/lib\1.so@g\"`" -APP_MODULES_INCLUDE="`echo $APP_MODULES | sed 's@c++_shared@@' | sed \"s@\([-a-zA-Z0-9_.]\+\)@-isystem$LOCAL_PATH/../\1/include@g\"`" +APP_MODULES_INCLUDE="`echo $APP_MODULES | sed 's@\bc++_shared\b@@' | sed 's@\bapplication\b@@' | sed \"s@\([-a-zA-Z0-9_.]\+\)@-isystem$LOCAL_PATH/../\1/include@g\"`" CFLAGS=" -g diff --git a/project/jni/application/setEnvironment-armeabi-v7a.sh b/project/jni/application/setEnvironment-armeabi-v7a.sh index 355b06dff..6acf757ad 100755 --- a/project/jni/application/setEnvironment-armeabi-v7a.sh +++ b/project/jni/application/setEnvironment-armeabi-v7a.sh @@ -64,7 +64,7 @@ if [ -n "$NO_SHARED_LIBS" ]; then fi APP_SHARED_LIBS="`echo $APP_SHARED_LIBS | sed \"s@\([-a-zA-Z0-9_.]\+\)@$LOCAL_PATH/../../obj/local/$ARCH/lib\1.so@g\"`" -APP_MODULES_INCLUDE="`echo $APP_MODULES | sed 's@c++_shared@@' | sed \"s@\([-a-zA-Z0-9_.]\+\)@-isystem$LOCAL_PATH/../\1/include@g\"`" +APP_MODULES_INCLUDE="`echo $APP_MODULES | sed 's@\bc++_shared\b@@' | sed 's@\bapplication\b@@' | sed \"s@\([-a-zA-Z0-9_.]\+\)@-isystem$LOCAL_PATH/../\1/include@g\"`" CFLAGS=" -g diff --git a/project/jni/application/setEnvironment-x86.sh b/project/jni/application/setEnvironment-x86.sh index c412c8912..50c7a7b87 100755 --- a/project/jni/application/setEnvironment-x86.sh +++ b/project/jni/application/setEnvironment-x86.sh @@ -63,7 +63,7 @@ if [ -n "$NO_SHARED_LIBS" ]; then fi APP_SHARED_LIBS="`echo $APP_SHARED_LIBS | sed \"s@\([-a-zA-Z0-9_.]\+\)@$LOCAL_PATH/../../obj/local/$ARCH/lib\1.so@g\"`" -APP_MODULES_INCLUDE="`echo $APP_MODULES | sed 's@c++_shared@@' | sed \"s@\([-a-zA-Z0-9_.]\+\)@-isystem$LOCAL_PATH/../\1/include@g\"`" +APP_MODULES_INCLUDE="`echo $APP_MODULES | sed 's@\bc++_shared\b@@' | sed 's@\bapplication\b@@' | sed \"s@\([-a-zA-Z0-9_.]\+\)@-isystem$LOCAL_PATH/../\1/include@g\"`" CFLAGS=" -g diff --git a/project/jni/application/setEnvironment-x86_64.sh b/project/jni/application/setEnvironment-x86_64.sh index 1baad3406..a0fdc2521 100755 --- a/project/jni/application/setEnvironment-x86_64.sh +++ b/project/jni/application/setEnvironment-x86_64.sh @@ -63,7 +63,7 @@ if [ -n "$NO_SHARED_LIBS" ]; then fi APP_SHARED_LIBS="`echo $APP_SHARED_LIBS | sed \"s@\([-a-zA-Z0-9_.]\+\)@$LOCAL_PATH/../../obj/local/$ARCH/lib\1.so@g\"`" -APP_MODULES_INCLUDE="`echo $APP_MODULES | sed 's@c++_shared@@' | sed \"s@\([-a-zA-Z0-9_.]\+\)@-isystem$LOCAL_PATH/../\1/include@g\"`" +APP_MODULES_INCLUDE="`echo $APP_MODULES | sed 's@\bc++_shared\b@@' | sed 's@\bapplication\b@@' | sed \"s@\([-a-zA-Z0-9_.]\+\)@-isystem$LOCAL_PATH/../\1/include@g\"`" CFLAGS=" -g