diff --git a/app-release.apk b/app-release.apk deleted file mode 120000 index 3c6429493..000000000 --- a/app-release.apk +++ /dev/null @@ -1 +0,0 @@ -project/app/build/outputs/apk/release/app-release.apk \ No newline at end of file diff --git a/project/jni/application/commandergenius/AndroidAppSettings.cfg b/project/jni/application/commandergenius/AndroidAppSettings.cfg index 24e2029e3..f132e748e 100644 --- a/project/jni/application/commandergenius/AndroidAppSettings.cfg +++ b/project/jni/application/commandergenius/AndroidAppSettings.cfg @@ -201,8 +201,8 @@ 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='y' # Minimum amount of RAM application requires, in Mb, SDL will print warning to user if it's lower AppMinimumRAM=64 @@ -211,7 +211,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 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 @@ -220,7 +220,7 @@ CustomBuildScript=n AppCflags='-frtti -fexceptions -finline-functions -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' +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 -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 diff --git a/project/jni/application/commandergenius/commandergenius b/project/jni/application/commandergenius/commandergenius index 56265e00b..dc03bf6d5 160000 --- a/project/jni/application/commandergenius/commandergenius +++ b/project/jni/application/commandergenius/commandergenius @@ -1 +1 @@ -Subproject commit 56265e00b360b2df56f723f6fa5e186f0d2eb948 +Subproject commit dc03bf6d59427399a0cbc3c8fddf8d584a709be3 diff --git a/project/jni/application/sdl-2.0-test/icon.png b/project/jni/application/sdl-2.0-test/icon.png deleted file mode 100644 index 61691777e..000000000 Binary files a/project/jni/application/sdl-2.0-test/icon.png and /dev/null differ diff --git a/project/jni/openssl/compile.sh b/project/jni/openssl/compile.sh index 76f7ee2ed..a7842d851 100755 --- a/project/jni/openssl/compile.sh +++ b/project/jni/openssl/compile.sh @@ -35,7 +35,7 @@ build() { mkdir -p build/$ARCH cd build/$ARCH - tar -x -v -z -f ../../openssl-1.1.1d.tar.gz --strip=1 + tar -x -v -z -f ../../openssl-1.1.1h.tar.gz --strip=1 NDK=`which ndk-build` NDK=`dirname $NDK` diff --git a/project/jni/openssl/openssl-1.1.1d.tar.gz b/project/jni/openssl/openssl-1.1.1h.tar.gz similarity index 51% rename from project/jni/openssl/openssl-1.1.1d.tar.gz rename to project/jni/openssl/openssl-1.1.1h.tar.gz index 216017a51..4014713f9 100644 Binary files a/project/jni/openssl/openssl-1.1.1d.tar.gz and b/project/jni/openssl/openssl-1.1.1h.tar.gz differ diff --git a/project/jni/sdl-2.0/android-project/app/src/main/AndroidManifest.xml b/project/jni/sdl-2.0/android-project/app/src/main/AndroidManifest.xml index 9bcd6e8fe..36d68c091 100644 --- a/project/jni/sdl-2.0/android-project/app/src/main/AndroidManifest.xml +++ b/project/jni/sdl-2.0/android-project/app/src/main/AndroidManifest.xml @@ -39,11 +39,24 @@ android:required="false" /> --> + + + + + + + + + + + +