From 487062dd11bffbf91f0ece86625187e126e96d8c Mon Sep 17 00:00:00 2001 From: Gerhard Stein Date: Sat, 3 Oct 2020 10:25:22 +0000 Subject: [PATCH] Using proper official target name --- changeAppSettings.sh | 10 +++++++++- .../application/sdl-2.0-test/AndroidAppSettings.cfg | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/changeAppSettings.sh b/changeAppSettings.sh index 35853df04..fa35aad6d 100755 --- a/changeAppSettings.sh +++ b/changeAppSettings.sh @@ -747,7 +747,15 @@ else MultiABI="$MultiABI" fi -LibrariesToLoad="\\\"sdl_native_helpers\\\", \\\"sdl-$LibSdlVersion\\\"" + +if [ "$LibSdlVersion" = "2.0" ] ; then + LibrariesToLoad="\\\"sdl_native_helpers\\\", \\\"SDL2\\\"" +else + LibrariesToLoad="\\\"sdl_native_helpers\\\", \\\"sdl-$LibSdlVersion\\\"" +fi + + + StaticLibraries="`echo ' include project/jni/SettingsTemplate.mk all: diff --git a/project/jni/application/sdl-2.0-test/AndroidAppSettings.cfg b/project/jni/application/sdl-2.0-test/AndroidAppSettings.cfg index ed273628c..14e7fd54c 100644 --- a/project/jni/application/sdl-2.0-test/AndroidAppSettings.cfg +++ b/project/jni/application/sdl-2.0-test/AndroidAppSettings.cfg @@ -37,7 +37,7 @@ AppVersionCode=101 AppVersionName="1.01" ResetSdlConfigForThisVersion=n DeleteFilesOnUpgrade="%" -CompiledLibraries="sdl2_mixer sdl2_image" +CompiledLibraries="SDL2_mixer SDL2_image" CustomBuildScript=n AppCflags='-O2 -finline-functions' AppLdflags=''