OpenLieroX: switched to stable branch 0.58

project/jni/application/openlierox/AndroidAppSettings.cfg

@@ -7,10 +7,10 @@ AppName="OpenLieroX"
 AppFullName=openlierox.net
 
 # Application version code (integer)
-AppVersionCode=0591007
+AppVersionCode=10580309
 
 # Application user-visible version name (string)
-AppVersionName="0.59b10a07"
+AppVersionName="0.58rc3a09"
 
 # 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
@@ -24,7 +24,7 @@ AppDataDownloadUrl="!!Game data|data.zip.xz"
 ResetSdlConfigForThisVersion=y
 
 # Delete application data files when upgrading (specify file/dir paths separated by spaces)
-DeleteFilesOnUpgrade="libsdl-DownloadFinished-0.flag" #"libsdl-DownloadFinished-0.flag"
+DeleteFilesOnUpgrade="libsdl-DownloadFinished-0.flag ." #"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/
@@ -264,13 +264,13 @@ APP_PLATFORM=android-21
 
 # Specify architectures to compile, 'all' or 'y' to compile for all architectures.
 # Available architectures: armeabi armeabi-v7a x86 mips arm64-v8a
-MultiABI='armeabi-v7a arm64-v8a' # arm64-v8a x86
+MultiABI='armeabi-v7a' # arm64-v8a x86
 #MultiABI='x86 x86_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 xml2 curl boost_signals boost_system openal gd jpeg vorbis ogg lzma"
+CompiledLibraries="sdl_image sdl_mixer xml2 curl gd jpeg vorbis ogg lzma"
 
 # Application uses custom build script AndroidBuild.sh instead of Android.mk (y) or (n)
 CustomBuildScript=n
@@ -282,13 +282,14 @@ AppCflags='-flto=thin -O3 -ffast-math -Werror=format -DDISABLE_JOYSTICK -DHAVE_L
 AppCppflags='-flto=thin -O3 -ffast-math -Werror=format -std=c++11 -frtti -fexceptions -DDISABLE_JOYSTICK -DHAVE_LINENOISE -DNBREAKPAD -DHAVE_EXECINFO=0 -DSINGLETHREADED=1'
 
 # Additional LDFLAGS for application
-AppLdflags='-flto=thin -flto-jobs=8 -O3'
+AppLdflags='-flto=thin -flto-jobs=8 -O1'
 
 # If application has headers with the same name as system headers, this option tries to fix compiler flags to make it compilable
 AppOverlapsSystemHeaders=n
 
 # Build only following subdirs (empty will build all dirs, ignored with custom script)
-AppSubdirsBuild='src/include src/src/* src/libs/hawknl/include src/libs/hawknl/src src/libs/libzip src/libs/linenoise src/libs/lua src/libs/pstreams'
+# src/src/game/* src/src/gui/* src/src/gusanos/* src/src/level/* src/src/utils/*
+AppSubdirsBuild='src/include src/src src/src/client/* src/src/common/* src/src/server/* src/libs/hawknl/include src/libs/hawknl/src src/libs/libzip src/libs/linenoise src/libs/lua src/libs/pstreams'
 
 # Exclude these files from build
 AppBuildExclude='src/libs/hawknl/src/ipx.c src/libs/linenoise/example.c'