From 9b478f546eff17dd39d7aff973646471828da8c0 Mon Sep 17 00:00:00 2001 From: zmertens Date: Thu, 18 Jan 2024 07:12:07 -0700 Subject: [PATCH] Update setup.sh to use array of strings --- examples/example_android_sdl3_opengl3/setup.sh | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/examples/example_android_sdl3_opengl3/setup.sh b/examples/example_android_sdl3_opengl3/setup.sh index ebab49438efc..39c8e336f87c 100644 --- a/examples/example_android_sdl3_opengl3/setup.sh +++ b/examples/example_android_sdl3_opengl3/setup.sh @@ -30,20 +30,12 @@ SOURCES=( \ "../../backends/imgui_impl_sdl3.h " \ "../../examples/example_sdl3_opengl3/main.cpp") -SOURCE_AS_STR="" -for val in "${SOURCES[@]}"; -do - SOURCE_AS_STR+=$val -done - -echo -n $SOURCE_AS_STR - ANDROID_JNI_PATH="${SDL_DIR}/build/${JAVA_PKG_NAME}/app/jni/src" ANDROID_STRINGS_PATH="${SDL_DIR}/build/${JAVA_PKG_NAME}/app/src/main/res/values" if [ ! -d "${ANDROID_JNI_PATH}" ]; then - bash ${SDL_BUILD_SCRIPTS_DIR}/androidbuild.sh $JAVA_PKG_NAME < "${SOURCE_AS_STR}" + bash ${SDL_BUILD_SCRIPTS_DIR}/androidbuild.sh $JAVA_PKG_NAME "${SOURCES[@]}" sed -i -e "s|-lGLESv2|-lGLESv2 -lGLESv3|" $ANDROID_JNI_PATH/Android.mk sed -i -e "s|Game|$APP_NAME|g" $ANDROID_STRINGS_PATH/strings.xml fi