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

Merge branch 'sdl_android' of github.com:pelya/commandergenius into sdl_android

Browse Source 
Conflicts:
	project/jni/application/commandergenius/AndroidAppSettings.cfg
	project/jni/application/commandergenius/AndroidData/keen1.zip
	project/jni/application/commandergenius/AndroidData/keen4.zip
	project/jni/application/commandergenius/AndroidData/keen7.zip
	project/jni/application/vcmi/AndroidAppSettings.cfg
This commit is contained in:
Gerhard Stein
2013-01-16 20:54:21 +01:00
parent 0956a581ba e647a970bb
commit 75d5f09148
3949 changed files with 466858 additions and 53117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,13 +37,13 @@ HiddenMenuOptions='KeyboardConfigMainMenu AudioConfig OptionalDownloadConfig'
FirstStartMenuOptions=''
MultiABI=n
AppMinimumRAM=64
AppVersionCode=08604
AppVersionName="0.86.04"
AppVersionCode=09000
AppVersionName="0.90.00"
ResetSdlConfigForThisVersion=y
DeleteFilesOnUpgrade=""
CompiledLibraries="mad sdl_mixer sdl_image sdl_ttf avutil avcore avcodec avformat swscale boost_program_options boost_filesystem boost_iostreams boost_system boost_thread vcmi android"
CustomBuildScript=n
AppCflags='-DDATA_DIR=\"/sdcard/app-data/eu.vcmi\" -DBIN_DIR=\"/data/data/eu.vcmi/files\" -DLIB_DIR=\"/data/data/eu.vcmi/files\" -DWITH_AVCODEC_DECODE_VIDEO2=1 -Wstrict-aliasing -Wcast-align -Wpointer-arith -Waddress'
CustomBuildScript=y
AppCflags='-DM_DATA_DIR=\"/sdcard/app-data/eu.vcmi\" -DM_BIN_DIR=\"/data/data/eu.vcmi/files\" -DM_LIB_DIR=\"/data/data/eu.vcmi/files\" -DWITH_AVCODEC_DECODE_VIDEO2=1 -Wstrict-aliasing -Wcast-align -Wpointer-arith -Waddress'
AppLdflags='-lz -Ljni/application/vcmi -lvcmi'
AppSubdirsBuild='vcmi/client vcmi/CCallback.cpp'
AppCmdline=''