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

Added shmem and vcmi updates for that implementation

Browse Source
This commit is contained in:
Gerhard Stein
2013-12-07 13:31:30 +01:00
parent 5b8ced6c15
commit 5aefe6b127
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -177,10 +177,10 @@ MultiABI=n
AppMinimumRAM=64 AppMinimumRAM=64
# Application version code (integer) # Application version code (integer)
AppVersionCode=165100 AppVersionCode=165200
# Application user-visible version name (string) # Application user-visible version name (string)
AppVersionName="1.6.5.1 Beta" AppVersionName="1.6.5.2 Beta"
# Reset SDL config when updating application to the new version (y) / (n) # Reset SDL config when updating application to the new version (y) / (n)
ResetSdlConfigForThisVersion=n ResetSdlConfigForThisVersion=n

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

@@ -56,7 +56,6 @@ CompatibilityHacks=y
# Application initializes SDL audio/video inside static constructors (which is bad, you won't be able to run ndk-gdb) (y)/(n) # Application initializes SDL audio/video inside static constructors (which is bad, you won't be able to run ndk-gdb) (y)/(n)
CompatibilityHacksStaticInit=n CompatibilityHacksStaticInit=n
# On-screen Android soft text input emulates hardware keyboard, this will only work with Hackers Keyboard app (y)/(n)
CompatibilityHacksTextInputEmulatesHwKeyboard=n CompatibilityHacksTextInputEmulatesHwKeyboard=n
# Hack for broken devices: prevent audio chopping, by sleeping a bit after pushing each audio chunk (y)/(n) # Hack for broken devices: prevent audio chopping, by sleeping a bit after pushing each audio chunk (y)/(n)
@@ -191,7 +190,7 @@ DeleteFilesOnUpgrade="%"
# Optional shared libraries to compile - removing some of them will save space # 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 # 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 # 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="mad sdl_mixer sdl_image sdl_ttf avutil avcodec avformat swscale boost_program_options boost_filesystem boost_iostreams boost_system boost_thread android" CompiledLibraries="shmem mad sdl_mixer sdl_image sdl_ttf avutil avcodec avformat swscale boost_program_options boost_filesystem boost_iostreams boost_system boost_thread android"
# Application uses custom build script AndroidBuild.sh instead of Android.mk (y) or (n) # Application uses custom build script AndroidBuild.sh instead of Android.mk (y) or (n)
CustomBuildScript=y CustomBuildScript=y

2
project/jni/boost/include/boost/interprocess/detail/workaround.hpp
View File

@@ -54,7 +54,7 @@
#endif #endif
//Check for XSI shared memory objects. They are available in nearly all UNIX platforms //Check for XSI shared memory objects. They are available in nearly all UNIX platforms
#if !defined(__QNXNTO__) && !defined(ANDROID) #if !defined(__QNXNTO__) /*&& !defined(ANDROID)*/
#define BOOST_INTERPROCESS_XSI_SHARED_MEMORY_OBJECTS #define BOOST_INTERPROCESS_XSI_SHARED_MEMORY_OBJECTS
#endif #endif

1
project/jni/shmem Submodule

Submodule project/jni/shmem added at c2a28f528d