From 902259cad77d36060da8a43b496d8d0afe3699d9 Mon Sep 17 00:00:00 2001 From: Gerhard Stein Date: Thu, 27 Jul 2023 11:48:50 +0200 Subject: [PATCH 1/8] Bump Commander Genius --- project/jni/application/commandergenius/commandergenius | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/jni/application/commandergenius/commandergenius b/project/jni/application/commandergenius/commandergenius index 56265e00b3..132f33d9bf 160000 --- a/project/jni/application/commandergenius/commandergenius +++ b/project/jni/application/commandergenius/commandergenius @@ -1 +1 @@ -Subproject commit 56265e00b360b2df56f723f6fa5e186f0d2eb948 +Subproject commit 132f33d9bf7ff55acb686ef990a585661beac636 From cf4e7deba7c3980f8d5dc5d76b6d9b2c91da01eb Mon Sep 17 00:00:00 2001 From: Gerhard Stein Date: Thu, 27 Jul 2023 12:35:17 +0200 Subject: [PATCH 2/8] Bump Commander Genius settings for android --- .../commandergenius/AndroidAppSettings.cfg | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/project/jni/application/commandergenius/AndroidAppSettings.cfg b/project/jni/application/commandergenius/AndroidAppSettings.cfg index 027d03907f..d443e83560 100644 --- a/project/jni/application/commandergenius/AndroidAppSettings.cfg +++ b/project/jni/application/commandergenius/AndroidAppSettings.cfg @@ -7,10 +7,10 @@ AppName="Commander Genius" AppFullName=net.sourceforge.clonekeenplus # Application version code (integer) -AppVersionCode=207010 +AppVersionCode=309004 # Application user-visible version name (string) -AppVersionName="2.0.7 Release" +AppVersionName="3.0.9 Release" # 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, other downloads should be selected by user from startup config menu @@ -31,7 +31,7 @@ DeleteFilesOnUpgrade="%" ReadmeText='^You may press "Home" now - the data will be downloaded in background' # libSDL version to use (1.2/1.3/2.0) -LibSdlVersion=1.2 +LibSdlVersion=2.0 # Specify screen orientation: (v)ertical/(p)ortrait or (h)orizontal/(l)andscape ScreenOrientation=h @@ -190,36 +190,39 @@ RedefinedKeysGamepad="LCTRL LALT SPACE RETURN" StartupMenuButtonTimeout=3000 # Menu items to hide from startup menu, available menu items: -# SettingsMenu.OkButton SettingsMenu.DummyMenu SettingsMenu.MainMenu SettingsMenuMisc.DownloadConfig SettingsMenuMisc.OptionalDownloadConfig SettingsMenuMisc.AudioConfig SettingsMenuMisc.VideoSettingsConfig SettingsMenuMisc.ShowReadme SettingsMenuMisc.GyroscopeCalibration 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 +# SettingsMenu.OkButton SettingsMenu.DummyMenu SettingsMenu.MainMenu SettingsMenuMisc.DownloadConfig SettingsMenuMisc.OptionalDownloadConfig SettingsMenuMisc.AudioConfig SettingsMenuMisc.VideoSettingsConfig SettingsMenuMisc.ShowReadme SettingsMenuMisc.GyroscopeCalibration 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 HiddenMenuOptions='SettingsMenuMouse.DisplaySizeConfig' # Menu items to show at startup - this is Java code snippet, leave empty for default # new SettingsMenuMisc.ShowReadme(), (AppUsesMouse \&\& \! ForceRelativeMouseMode \? new SettingsMenuMouse.DisplaySizeConfig(true) : new SettingsMenu.DummyMenu()), new SettingsMenuMisc.OptionalDownloadConfig(true), new SettingsMenuMisc.GyroscopeCalibration() # Available menu items: -# SettingsMenu.OkButton SettingsMenu.DummyMenu SettingsMenu.MainMenu SettingsMenuMisc.DownloadConfig SettingsMenuMisc.OptionalDownloadConfig SettingsMenuMisc.AudioConfig SettingsMenuMisc.VideoSettingsConfig SettingsMenuMisc.ShowReadme SettingsMenuMisc.GyroscopeCalibration 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 +# SettingsMenu.OkButton SettingsMenu.DummyMenu SettingsMenu.MainMenu SettingsMenuMisc.DownloadConfig SettingsMenuMisc.OptionalDownloadConfig SettingsMenuMisc.AudioConfig SettingsMenuMisc.VideoSettingsConfig SettingsMenuMisc.ShowReadme SettingsMenuMisc.GyroscopeCalibration 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 FirstStartMenuOptions='' # Enable multi-ABI binary, with hardware FPU support - it will also work on old devices, # but .apk size is 2x bigger (y) / (n) / (x86) / (all) -MultiABI='armeabi-v7a' -#MultiABI='y' +#MultiABI='armeabi-v7a' +#MultiABI='arm64-v8a' +MultiABI='y' # Minimum amount of RAM application requires, in Mb, SDL will print warning to user if it's lower AppMinimumRAM=64 # Optional shared libraries to compile - removing some of them will save space # MP3 support by libMAD is encumbered by patents and libMAD is GPL-ed -# 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 -CompiledLibraries="sdl_image sdl_mixer boost_system crypto ssl curl vorbis ogg" +# 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 +#CompiledLibraries="sdl2_image sdl_mixer crypto ssl curl" +CompiledLibraries="c++_shared SDL2_mixer SDL2_image SDL2_ttf curl ssl crypto" + # Application uses custom build script AndroidBuild.sh instead of Android.mk (y) or (n) CustomBuildScript=n # Aditional CFLAGS for application -AppCflags='-frtti -fexceptions -finline-functions -DOGG=1 -DUSE_FILE32API -DDOWNLOADER=1 -DANDROID=1 -DREFKEEN_VER_KDREAMS -DGRMODE=EGAGR -DREFKEEN_VER_KDREAMS_ANYEGA_ALL -DIOAPI_NO_64 -DBUILD_TYPE=LINUX -DTARGET_LNX=1 -DNOTYPESAVE -Werror=strict-aliasing -Werror=cast-align -Werror=pointer-arith -Werror=address -std=c99 -Ijni/../jni/application/commandergenius/commandergenius/GsKit -Ijni/vorbis/include/vorbis -Ijni/curl/include' +AppCflags='-frtti -fexceptions -finline-functions -DBUILD_COSMOS -DFORCE_HTTPS -DOGG=1 -DLUA_USE_POSIX -DUSE_FILE32API -DDOWNLOADER=1 -DANDROID=1 -DREFKEEN_VER_KDREAMS -DGRMODE=EGAGR -DREFKEEN_VER_KDREAMS_ANYEGA_ALL -DIOAPI_NO_64 -DBUILD_TYPE=LINUX -DTARGET_LNX=1 -DNOTYPESAVE -Werror=strict-aliasing -Werror=pointer-arith -Werror=address -std=c99 -Ijni/../jni/application/commandergenius/commandergenius/GsKit -Ijni/vorbis/include/vorbis -Ijni/curl/include' # Aditional CXXFLAGS for application -AppCppflags='-frtti -fexceptions -finline-functions -DOGG=1 -DUSE_FILE32API -DDOWNLOADER=1 -DANDROID=1 -DREFKEEN_VER_KDREAMS -DGRMODE=EGAGR -DREFKEEN_VER_KDREAMS_ANYEGA_ALL -DIOAPI_NO_64 -DBUILD_TYPE=LINUX -DTARGET_LNX=1 -DNOTYPESAVE -Werror=strict-aliasing -Werror=cast-align -Werror=pointer-arith -Werror=address -std=c++14 -Ijni/../jni/application/commandergenius/commandergenius/GsKit -Ijni/vorbis/include/vorbis -Ijni/curl/include' +AppCppflags='-frtti -fexceptions -finline-functions -DBUILD_COSMOS -DFORCE_HTTPS -DOGG=1 -DUSE_FILE32API -DUSE_VIRTUALPAD -DDOWNLOADER=1 -DANDROID=1 -DREFKEEN_VER_KDREAMS -DGRMODE=EGAGR -DREFKEEN_VER_KDREAMS_ANYEGA_ALL -DIOAPI_NO_64 -DBUILD_TYPE=LINUX -DTARGET_LNX=1 -DNOTYPESAVE -DDISABLE_HOVER -Werror=strict-aliasing -Werror=cast-align -Werror=pointer-arith -Werror=address -std=c++14 -Ijni/../jni/application/commandergenius/commandergenius/GsKit' # Additional LDFLAGS for application From f14a9db4b0c078a7ddca310ee1662a65606326d1 Mon Sep 17 00:00:00 2001 From: Gerhard Stein Date: Thu, 27 Jul 2023 12:41:00 +0200 Subject: [PATCH 3/8] Fixed wrong spacing --- changeAppSettings.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changeAppSettings.sh b/changeAppSettings.sh index c1ac3a2305..236a280a0b 100755 --- a/changeAppSettings.sh +++ b/changeAppSettings.sh @@ -498,7 +498,7 @@ HorizontalOrientation=false UsingSdl2=false if [ "$LibSdlVersion" = "2.0" ] ; then - "$LibSdlVersion" = "2" + "$LibSdlVersion"="2" fi if [ "$LibSdlVersion" = "2" ] ; then UsingSdl2=true From 10b199e707c3854a17ed0ec4014b65f11472c523 Mon Sep 17 00:00:00 2001 From: Gerhard Stein Date: Thu, 27 Jul 2023 12:41:46 +0200 Subject: [PATCH 4/8] Fixed wrong spacing --- changeAppSettings.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changeAppSettings.sh b/changeAppSettings.sh index 236a280a0b..0ba2826385 100755 --- a/changeAppSettings.sh +++ b/changeAppSettings.sh @@ -498,7 +498,7 @@ HorizontalOrientation=false UsingSdl2=false if [ "$LibSdlVersion" = "2.0" ] ; then - "$LibSdlVersion"="2" + LibSdlVersion="2" fi if [ "$LibSdlVersion" = "2" ] ; then UsingSdl2=true From 9eb294a4d5073236c2e1480f24a9049975c1a8f4 Mon Sep 17 00:00:00 2001 From: Gerhard Stein Date: Thu, 27 Jul 2023 12:49:14 +0200 Subject: [PATCH 5/8] OpenSSL compile script fix --- project/jni/openssl/compile.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/jni/openssl/compile.sh b/project/jni/openssl/compile.sh index 57a1579b8c..30d86da4a2 100755 --- a/project/jni/openssl/compile.sh +++ b/project/jni/openssl/compile.sh @@ -1,6 +1,6 @@ #!/bin/sh -if [ -z "$ARCH_LIST" ]; then +if [ -z "$ARCH_LIST" ] | [ "$ARCH_LIST" = "all" ]; then ARCH_LIST="arm64-v8a armeabi-v7a x86_64 x86" fi From 4c0ee012857460fb0cb187718c9f168f813b23f7 Mon Sep 17 00:00:00 2001 From: Gerhard Stein Date: Thu, 27 Jul 2023 13:14:13 +0200 Subject: [PATCH 6/8] ABI Level 19 for later NDKs when trying to compile OpenSSL --- project/jni/openssl/config.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project/jni/openssl/config.patch b/project/jni/openssl/config.patch index ac706df857..11edf61a0f 100644 --- a/project/jni/openssl/config.patch +++ b/project/jni/openssl/config.patch @@ -7,13 +7,13 @@ diff -u -r armeabi-v7a-old/Configurations/15-android.conf armeabi-v7a/Configurat my %triplet = ( - arm => "arm-linux-androideabi", - arm64 => "aarch64-linux-android", -+ arm => "armv7a-linux-androideabi16", ++ arm => "armv7a-linux-androideabi19", + arm64 => "aarch64-linux-android21", mips => "mipsel-linux-android", mips64 => "mips64el-linux-android", - x86 => "i686-linux-android", - x86_64 => "x86_64-linux-android", -+ x86 => "i686-linux-android16", ++ x86 => "i686-linux-android19", + x86_64 => "x86_64-linux-android21", ); From 1852b09c9b22fc960fed7b27af470c164eb8b624 Mon Sep 17 00:00:00 2001 From: Gerhard Stein Date: Thu, 27 Jul 2023 15:53:43 +0200 Subject: [PATCH 7/8] Bump Commander Genius version --- .../jni/application/commandergenius/AndroidAppSettings.cfg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/project/jni/application/commandergenius/AndroidAppSettings.cfg b/project/jni/application/commandergenius/AndroidAppSettings.cfg index d443e83560..35df6a8e2e 100644 --- a/project/jni/application/commandergenius/AndroidAppSettings.cfg +++ b/project/jni/application/commandergenius/AndroidAppSettings.cfg @@ -7,10 +7,10 @@ AppName="Commander Genius" AppFullName=net.sourceforge.clonekeenplus # Application version code (integer) -AppVersionCode=309004 +AppVersionCode=340000 # Application user-visible version name (string) -AppVersionName="3.0.9 Release" +AppVersionName="3.4.0 Release" # 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, other downloads should be selected by user from startup config menu @@ -212,7 +212,7 @@ AppMinimumRAM=64 # MP3 support by libMAD is encumbered by patents and libMAD is GPL-ed # 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 #CompiledLibraries="sdl2_image sdl_mixer crypto ssl curl" -CompiledLibraries="c++_shared SDL2_mixer SDL2_image SDL2_ttf curl ssl crypto" +CompiledLibraries="c++_shared SDL2_mixer SDL2_image SDL2_ttf jpeg png curl ssl crypto" # Application uses custom build script AndroidBuild.sh instead of Android.mk (y) or (n) From c6ec8da264bc64ef33364b7730551fdaa7dd3779 Mon Sep 17 00:00:00 2001 From: Gerhard Stein Date: Thu, 27 Jul 2023 17:49:40 +0200 Subject: [PATCH 8/8] Pipe symbol fiy --- project/jni/openssl/compile.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/jni/openssl/compile.sh b/project/jni/openssl/compile.sh index 30d86da4a2..5693d128e6 100755 --- a/project/jni/openssl/compile.sh +++ b/project/jni/openssl/compile.sh @@ -1,6 +1,6 @@ #!/bin/sh -if [ -z "$ARCH_LIST" ] | [ "$ARCH_LIST" = "all" ]; then +if [ -z "$ARCH_LIST" ] || [ "$ARCH_LIST" = "all" ]; then ARCH_LIST="arm64-v8a armeabi-v7a x86_64 x86" fi