diff --git a/changeAppSettings.sh b/changeAppSettings.sh index ebc2b5893..affdb27eb 100755 --- a/changeAppSettings.sh +++ b/changeAppSettings.sh @@ -880,6 +880,7 @@ fi echo Patching project/AndroidManifest.xml cat $ANDROID_MANIFEST_TEMPLATE | \ + sed "s/package=.*//" | \ sed "s/android:screenOrientation=.*/android:screenOrientation=\"$ScreenOrientation1\"/" | \ sed "s^android:versionCode=.*^android:versionCode=\"$AppVersionCode\"^" | \ sed "s^android:versionName=.*^android:versionName=\"$AppVersionName\"^" | \ diff --git a/project/jni/application/sdl2-demo/AndroidAppSettings.cfg b/project/jni/application/sdl2-demo/AndroidAppSettings.cfg index d44c0e08a..e66ea932c 100644 --- a/project/jni/application/sdl2-demo/AndroidAppSettings.cfg +++ b/project/jni/application/sdl2-demo/AndroidAppSettings.cfg @@ -12,7 +12,7 @@ AppVersionCode=1 # Application user-visible version name (string) AppVersionName="1" -# Specify path to download application data in zip archive in the form "Description|URL|MirrorURL^Description2|URL2|MirrorURL2^..." +# Specify path to download application data in zip archive in the form "Description|URL|MirrorURL^Description2|URL2|MirrorURL2^...' # If you'll start Description with '!' symbol it will be enabled by default, '!!' will also hide the entry from the menu, so it cannot be disabled # If the URL in in the form ':dir/file.dat:http://URL/' it will be downloaded as binary BLOB to the application dir and not unzipped # If the URL does not contain 'http://' or 'https://', it is treated as file from 'project/jni/application/src/AndroidData' dir - @@ -20,14 +20,6 @@ AppVersionName="1" # You can specify Google Play expansion files in the form 'obb:main.12345' or 'obb:patch.12345' where 12345 is the app version for the obb file # You can mount expansion files created with jobb tool if you put 'mnt:main.12345' or 'mnt:patch.12345' # The mount directory will be returned by calling getenv("ANDROID_OBB_MOUNT_DIR") -# Android app bundles do not support .obb files, they use asset packs instead. -# This app project includes one pre-configured install-time asset pack. -# To put your data into asset pack, copy it to the directory AndroidData/assetpack -# and run changeAppSettings.sh. The asset pack zip archive will be returned by -# getenv("ANDROID_ASSET_PACK_PATH"), this call will return NULL if the asset pack is not installed. -# You can put "assetpack" keyword to AppDataDownloadUrl, the code will check -# if the asset pack is installed and will not download the data from other URLs. -# You can extract files from the asset pack the same way you extract files from the app assets. # You can use .zip.xz archives for better compression, but you need to add 'lzma' to CompiledLibraries # Generate .zip.xz files like this: zip -0 -r data.zip your-data/* ; xz -8 data.zip AppDataDownloadUrl="!!App data|data.zip" @@ -40,7 +32,7 @@ DeleteFilesOnUpgrade="libsdl-DownloadFinished-0.flag" # Here you may type readme text, which will be shown during startup. Format is: # Text in English, use \\\\n to separate lines (that's four backslashes)^de:Text in Deutsch^ru:Text in Russian^button:Button that will open some URL:http://url-to-open/ -ReadmeText='^You may press "Home" now - the data will be downloaded in background' +ReadmeText='^You may press "Home" now - the data will be downloaded in background' | sed 's/\\n/\\\\n/g' # libSDL version to use (1.2/2) LibSdlVersion=2 @@ -227,7 +219,7 @@ AppTouchscreenKeyboardKeysAmount=2 RedefinedKeysScreenGestures="" # Redefine on-screen keyboard keys to SDL keysyms - currently 12 keys is the maximum -RedefinedKeysScreenKb="SPACE LCTRL " +RedefinedKeysScreenKb="SPACE LCTRL " # Names for on-screen keyboard keys, such as Fire, Jump, Run etc, separated by spaces, they are used in SDL config menu RedefinedKeysScreenKbNames="Jump Action" @@ -261,7 +253,7 @@ RedefinedKeysFourthGamepad="" # How long to show startup menu button, in msec, 0 to disable startup menu StartupMenuButtonTimeout=3000 -# Menu items to hide from startup menu, available menu items: +# Menu items to hide from startup menu, available menu items (SDL 1.2 only): # SettingsMenu.OkButton SettingsMenu.DummyMenu SettingsMenu.MainMenu SettingsMenuMisc.DownloadConfig SettingsMenuMisc.OptionalDownloadConfig SettingsMenuMisc.AudioConfig SettingsMenuMisc.VideoSettingsConfig SettingsMenuMisc.ShowReadme SettingsMenuMisc.GyroscopeCalibration SettingsMenuMisc.StorageAccessConfig SettingsMenuMisc.CommandlineConfig SettingsMenuMisc.ResetToDefaultsConfig SettingsMenuMouse.MouseConfigMainMenu SettingsMenuMouse.DisplaySizeConfig SettingsMenuMouse.LeftClickConfig SettingsMenuMouse.RightClickConfig SettingsMenuMouse.AdditionalMouseConfig SettingsMenuMouse.JoystickMouseConfig SettingsMenuMouse.TouchPressureMeasurementTool SettingsMenuMouse.CalibrateTouchscreenMenu SettingsMenuKeyboard.KeyboardConfigMainMenu SettingsMenuKeyboard.ScreenKeyboardSizeConfig SettingsMenuKeyboard.ScreenKeyboardDrawSizeConfig SettingsMenuKeyboard.ScreenKeyboardThemeConfig SettingsMenuKeyboard.ScreenKeyboardTransparencyConfig SettingsMenuKeyboard.RemapHwKeysConfig SettingsMenuKeyboard.RemapScreenKbConfig SettingsMenuKeyboard.ScreenGesturesConfig SettingsMenuKeyboard.CustomizeScreenKbLayout SettingsMenuKeyboard.ScreenKeyboardAdvanced HiddenMenuOptions='SettingsMenuMisc.OptionalDownloadConfig SettingsMenuMouse.DisplaySizeConfig' @@ -286,11 +278,11 @@ APP_PLATFORM= # Specify architectures to compile, 'all' or 'y' to compile for all architectures. # Available architectures: armeabi-v7a arm64-v8a x86 x86_64 MultiABI='armeabi-v7a arm64-v8a x86 x86_64' -#MultiABI='arm64-v8a' # Optional shared libraries to compile - removing some of them will save space # MP3 patents are expired, but libmad license is GPL, not LGPL -# Available libraries: mad (GPL-ed!) sdl_mixer sdl_image sdl_ttf sdl_net sdl_blitpool sdl_gfx sdl_sound intl xml2 lua jpeg png ogg flac tremor vorbis freetype xerces curl theora fluidsynth lzma lzo2 mikmod openal timidity zzip bzip2 yaml-cpp python boost_date_time boost_filesystem boost_iostreams boost_program_options boost_regex boost_signals boost_system boost_thread glu avcodec avdevice avfilter avformat avresample avutil swscale swresample bzip2 +# Available libraries: mad (GPL-ed!) sdl_mixer sdl_image sdl_ttf sdl_net sdl_blitpool sdl_gfx sdl_sound intl xml2 lua jpeg png ogg flac tremor vorbis freetype xerces curl theora fluidsynth lzma lzo2 mikmod openal timidity zzip bzip2 yaml-cpp python boost_date_time boost_filesystem boost_iostreams boost_program_options boost_regex boost_signals boost_system boost_thread glu avcodec avdevice avfilter avformat avresample avutil swscale swresample bzip2 +# rep 'Available' project/jni/SettingsTemplate.mk CompiledLibraries="c++_shared SDL2_image SDL2_ttf" # Application uses custom build script AndroidBuild.sh instead of Android.mk (y) or (n) @@ -335,4 +327,3 @@ GooglePlayGameServicesId= # The app will open files with following extension, file path will be added to commandline params AppOpenFileExtension='' -