miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More stuff starting to work on CG and SDL 2.0

Browse Source
This commit is contained in:
Gerhard Stein
2020-10-09 17:20:17 +00:00
parent 4a82d315d5
commit 61ec755987
7 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app-release.apk
View File

@@ -1 +0,0 @@
project/app/build/outputs/apk/release/app-release.apk

8
project/jni/application/commandergenius/AndroidAppSettings.cfg
View File

@@ -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

2
project/jni/application/commandergenius/commandergenius

Submodule project/jni/application/commandergenius/commandergenius updated: 56265e00b3...dc03bf6d59

BIN
project/jni/application/sdl-2.0-test/icon.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 315 B

2
project/jni/openssl/compile.sh
View File

@@ -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`

BIN
project/jni/openssl/openssl-1.1.1d.tar.gz → project/jni/openssl/openssl-1.1.1h.tar.gz
View File

Binary file not shown.

13
project/jni/sdl-2.0/android-project/app/src/main/AndroidManifest.xml
View File

@@ -39,11 +39,24 @@
android:required="false" /> -->
<!-- Allow writing to external storage -->
<!--
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-->
<!-- Allow access to Bluetooth devices -->
<uses-permission android:name="android.permission.BLUETOOTH" />
<!-- Allow access to the vibrator -->
<uses-permission android:name="android.permission.VIBRATE" />
<!-- ==INTERNET== --> <uses-permission android:name="android.permission.INTERNET" />
<!-- ==EXTERNAL_STORAGE== --> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<!-- ==NOT_EXTERNAL_STORAGE== --> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="18" />
<!-- ==NOT_EXTERNAL_STORAGE== --> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="18" /> <!-- App has write access to it's own dir on SD card without this permission on Android 4.4 and above -->
<!-- ==READ_OBB== --> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="18" />
<!-- ==READ_OBB== --> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="23" /> <!-- OBB file requires explicit permission before Marshmallow -->
<!-- ==RECORD_AUDIO== --> <uses-permission android:name="android.permission.RECORD_AUDIO" />
<!-- ==ADMOB== --> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<!-- ==FOREGROUND_SERVICE== --> <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<!-- if you want to capture audio, uncomment this. -->
<!-- <uses-permission android:name="android.permission.RECORD_AUDIO" /> -->