From 712e3b162484a61e3c9cb825cd9e07f5df86280f Mon Sep 17 00:00:00 2001 From: Gerhard Stein Date: Mon, 28 Sep 2020 15:31:27 +0000 Subject: [PATCH] Added case for SDL2, reduction of base libs --- changeAppSettings.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/changeAppSettings.sh b/changeAppSettings.sh index 4357459b0..37c31d845 100755 --- a/changeAppSettings.sh +++ b/changeAppSettings.sh @@ -995,11 +995,18 @@ $SEDI "s%public static String GooglePlayGameServicesId = .*%public static String $SEDI "s/public static String AppLibraries.*/public static String AppLibraries[] = { $LibrariesToLoad };/" project/src/Globals.java $SEDI "s/public static String AppMainLibraries.*/public static String AppMainLibraries[] = { $MainLibrariesToLoad };/" project/src/Globals.java +APP_MODULES_BASE="sdl-$LibSdlVersion sdl_main sdl_native_helpers jpeg png ogg flac vorbis freetype" +if [ "$LibSdlVersion" = "2.0" ]; then + APP_MODULES_BASE="sdl-$LibSdlVersion" +fi + + + echo Patching project/jni/Settings.mk echo '# DO NOT EDIT THIS FILE - it is automatically generated, edit file SettingsTemplate.mk' > project/jni/Settings.mk cat project/jni/SettingsTemplate.mk | \ - sed "s/APP_MODULES := .*/APP_MODULES := sdl-$LibSdlVersion sdl_main sdl_native_helpers jpeg png ogg flac vorbis freetype $CompiledLibraries application/" | \ + sed "s/APP_MODULES := .*/APP_MODULES := $APP_MODULES_BASE $CompiledLibraries application/" | \ sed "s/APP_ABI := .*/APP_ABI := $MultiABI/" | \ sed "s/SDL_JAVA_PACKAGE_PATH := .*/SDL_JAVA_PACKAGE_PATH := $AppFullNameUnderscored/" | \ sed "s^SDL_CURDIR_PATH := .*^SDL_CURDIR_PATH := $DataPath^" | \