diff --git a/project/jni/application/Android.mk b/project/jni/application/Android.mk index d5b2c8853..0b7babc14 100644 --- a/project/jni/application/Android.mk +++ b/project/jni/application/Android.mk @@ -70,15 +70,15 @@ LIBS_WITH_LONG_SYMBOLS := $(strip $(shell \ done \ ) ) -ifneq "$(LIBS_WITH_LONG_SYMBOLS)" "" -$(foreach F, $(LIBS_WITH_LONG_SYMBOLS), \ -$(info Library $(F): abusing symbol names are: \ -$(shell nm -g $(LOCAL_PATH)/../../obj/local/armeabi/$(F) | cut -c 12- | egrep '.{128}' ) ) \ -$(info Library $(F) contains symbol names longer than 128 bytes, \ -YOUR CODE WILL DEADLOCK WITHOUT ANY WARNING when you'll access such function - \ -please make this library static to avoid problems. ) ) -$(error Detected libraries with too long symbol names. Remove all files under project/obj/local/armeabi, make these libs static, and recompile) -endif +#ifneq "$(LIBS_WITH_LONG_SYMBOLS)" "" +#$(foreach F, $(LIBS_WITH_LONG_SYMBOLS), \ +#$(info Library $(F): abusing symbol names are: \ +#$(shell nm -g $(LOCAL_PATH)/../../obj/local/armeabi/$(F) | cut -c 12- | egrep '.{128}' ) ) \ +#$(info Library $(F) contains symbol names longer than 128 bytes, \ +#YOUR CODE WILL DEADLOCK WITHOUT ANY WARNING when you'll access such function - \ +#please make this library static to avoid problems. ) ) +#$(error Detected libraries with too long symbol names. Remove all files under project/obj/local/armeabi, make these libs static, and recompile) +#endif APP_LIB_DEPENDS := $(foreach LIB, $(LOCAL_SHARED_LIBRARIES), $(abspath $(LOCAL_PATH)/../../obj/local/armeabi/lib$(LIB).so)) APP_LIB_DEPENDS += $(foreach LIB, $(LOCAL_STATIC_LIBRARIES), $(abspath $(LOCAL_PATH)/../../obj/local/armeabi/lib$(LIB).a)) diff --git a/project/jni/application/scummvm/AndroidAppSettings.cfg b/project/jni/application/scummvm/AndroidAppSettings.cfg index d2aed5db1..9aec0c147 100644 --- a/project/jni/application/scummvm/AndroidAppSettings.cfg +++ b/project/jni/application/scummvm/AndroidAppSettings.cfg @@ -5,7 +5,7 @@ AppName="ScummVM" AppFullName=org.scummvm.sdl ScreenOrientation=h InhibitSuspend=n -AppDataDownloadUrl="MIDI music support (30 Mb) - add soundfont in Options->MIDI|http://sourceforge.net/projects/libsdl-android/files/GeneralUser-GS-FluidSynth-v1.43.sf2.zip/download^Lure of the Temptress (English, 10 Mb)|http://sourceforge.net/projects/scummvm/files/extras/Lure%20of%20the%20Temptress/lure-1.1.zip/download^Lure of the Temptress (German, 10 Mb)|http://sourceforge.net/projects/scummvm/files/extras/Lure%20of%20the%20Temptress/lure-de-1.1.zip/download^Lure of the Temptress (French, 10 Mb)|http://sourceforge.net/projects/scummvm/files/extras/Lure%20of%20the%20Temptress/lure-fr-1.1.zip/download^Lure of the Temptress (Italian, 10 Mb)|http://sourceforge.net/projects/scummvm/files/extras/Lure%20of%20the%20Temptress/lure-it-1.1.zip/download^Lure of the Temptress (Spanish, 10 Mb)|http://sourceforge.net/projects/scummvm/files/extras/Lure%20of%20the%20Temptress/lure-es-1.1.zip/download^Beneath a Steel Sky (CD version, 70 Mb)|http://sourceforge.net/projects/scummvm/files/extras/Beneath%20a%20Steel%20Sky/bass-cd-1.2.zip/download^Beneath a Steel Sky (floppy version, 10 Mb)|http://sourceforge.net/projects/scummvm/files/extras/Beneath%20a%20Steel%20Sky/BASS-Floppy-1.3.zip/download^Flight of the Amazon Queen (23 Mb)|http://sourceforge.net/projects/scummvm/files/extras/Flight%20of%20the%20Amazon%20Queen/FOTAQ_Floppy.zip/download^Flight of the Amazon Queen - voice addon (English, 35 Mb)|http://sourceforge.net/projects/scummvm/files/extras/Flight%20of%20the%20Amazon%20Queen/FOTAQ_Talkie-1.1.zip/download^Flight of the Amazon Queen - voice addon (German, 80 Mb)|http://sourceforge.net/projects/scummvm/files/extras/Flight%20of%20the%20Amazon%20Queen/FOTAQ_Ger_talkie-1.0.zip/download^Flight of the Amazon Queen - voice addon (Hebrew, 70 Mb)|http://sourceforge.net/projects/scummvm/files/extras/Flight%20of%20the%20Amazon%20Queen/FOTAQ_Heb_talkie.zip/download^Drascula: The Vampire Strikes Back (35 Mb)|http://sourceforge.net/projects/scummvm/files/extras/Drascula_%20The%20Vampire%20Strikes%20Back/drascula-1.0.zip/download^Drascula: The Vampire Strikes Back - translations addon (35 Mb)|http://sourceforge.net/projects/scummvm/files/extras/Drascula_%20The%20Vampire%20Strikes%20Back/drascula-int-1.1.zip/download^Drascula: The Vampire Strikes Back - audio addon (40 Mb)|http://sourceforge.net/projects/scummvm/files/extras/Drascula_%20The%20Vampire%20Strikes%20Back/drascula-audio-2.0.zip/download^!ScummVM data|data1.zip^!ScummVM data|data2.zip" +AppDataDownloadUrl="MIDI music support (30 Mb) - add soundfont in Options->MIDI|http://sourceforge.net/projects/libsdl-android/files/GeneralUser-GS-FluidSynth-v1.43.sf2.zip/download^Beneath a Steel Sky (CD version, 70 Mb)|http://sourceforge.net/projects/scummvm/files/extras/Beneath%20a%20Steel%20Sky/bass-cd-1.2.zip/download^Beneath a Steel Sky (floppy version, 10 Mb)|http://sourceforge.net/projects/scummvm/files/extras/Beneath%20a%20Steel%20Sky/BASS-Floppy-1.3.zip/download^Flight of the Amazon Queen (23 Mb)|http://sourceforge.net/projects/scummvm/files/extras/Flight%20of%20the%20Amazon%20Queen/FOTAQ_Floppy.zip/download^Flight of the Amazon Queen - voice addon (English, 35 Mb)|http://sourceforge.net/projects/scummvm/files/extras/Flight%20of%20the%20Amazon%20Queen/FOTAQ_Talkie-1.1.zip/download^Flight of the Amazon Queen - voice addon (German, 80 Mb)|http://sourceforge.net/projects/scummvm/files/extras/Flight%20of%20the%20Amazon%20Queen/FOTAQ_Ger_talkie-1.0.zip/download^Flight of the Amazon Queen - voice addon (Hebrew, 70 Mb)|http://sourceforge.net/projects/scummvm/files/extras/Flight%20of%20the%20Amazon%20Queen/FOTAQ_Heb_talkie.zip/download^Drascula: The Vampire Strikes Back (35 Mb)|http://sourceforge.net/projects/scummvm/files/extras/Drascula_%20The%20Vampire%20Strikes%20Back/drascula-1.0.zip/download^Drascula: The Vampire Strikes Back - translations addon (35 Mb)|http://sourceforge.net/projects/scummvm/files/extras/Drascula_%20The%20Vampire%20Strikes%20Back/drascula-int-1.1.zip/download^Drascula: The Vampire Strikes Back - audio addon (40 Mb)|http://sourceforge.net/projects/scummvm/files/extras/Drascula_%20The%20Vampire%20Strikes%20Back/drascula-audio-2.0.zip/download^Soltys (English, 4Mb)|http://downloads.sourceforge.net/project/scummvm/extras/Soltys/soltys-en-v1.0.zip^Soltys (Polish, 4Mb)|http://downloads.sourceforge.net/project/scummvm/extras/Soltys/soltys-pl-v1.0.zip^Lure of the Temptress (English, 10 Mb)|http://sourceforge.net/projects/scummvm/files/extras/Lure%20of%20the%20Temptress/lure-1.1.zip/download^Lure of the Temptress (German, 10 Mb)|http://sourceforge.net/projects/scummvm/files/extras/Lure%20of%20the%20Temptress/lure-de-1.1.zip/download^Lure of the Temptress (French, 10 Mb)|http://sourceforge.net/projects/scummvm/files/extras/Lure%20of%20the%20Temptress/lure-fr-1.1.zip/download^Lure of the Temptress (Italian, 10 Mb)|http://sourceforge.net/projects/scummvm/files/extras/Lure%20of%20the%20Temptress/lure-it-1.1.zip/download^Lure of the Temptress (Spanish, 10 Mb)|http://sourceforge.net/projects/scummvm/files/extras/Lure%20of%20the%20Temptress/lure-es-1.1.zip/download^!ScummVM data|data1.zip^!ScummVM data|data2.zip" VideoDepthBpp=16 NeedDepthBuffer=n NeedStencilBuffer=n @@ -16,6 +16,7 @@ SdlVideoResizeKeepAspect=n CompatibilityHacks=n AppUsesMouse=y AppNeedsTwoButtonMouse=y +ShowMouseCursor=n ForceRelativeMouseMode=n AppNeedsArrowKeys=n AppNeedsTextInput=n @@ -31,12 +32,14 @@ StartupMenuButtonTimeout=3000 HiddenMenuOptions='' FirstStartMenuOptions='' MultiABI=n -AppVersionCode=13102 -AppVersionName="1.3.1.02" +AppVersionCode=14102 +AppVersionName="1.4.1.02" +ResetSdlConfigForThisVersion=n +DeleteFilesOnUpgrade="%" CompiledLibraries="mad tremor flac ogg jpeg png fluidsynth" CustomBuildScript=y AppCflags='' -AppLdflags='' +AppLdflags='-ldl' AppSubdirsBuild='' AppCmdline='' ReadmeText='^You may press "Home" now - the data will be downloaded in background' diff --git a/project/jni/application/scummvm/AndroidBuild.sh b/project/jni/application/scummvm/AndroidBuild.sh index e3cb16bb2..5a7146bd4 100755 --- a/project/jni/application/scummvm/AndroidBuild.sh +++ b/project/jni/application/scummvm/AndroidBuild.sh @@ -21,6 +21,10 @@ ln -sf libtremor.a $LOCAL_PATH/../../../obj/local/armeabi/libvorbisidec.a ln -sf libflac.a $LOCAL_PATH/../../../obj/local/armeabi/libFLAC.a if [ \! -f scummvm/config.mk ] ; then - ../setEnvironment.sh sh -c "cd scummvm && env LIBS='-lflac -ltremor -logg -lmad -lz -lgcc -lfluidsynth -lstdc++' ./configure --host=androidsdl --enable-zlib --enable-tremor --enable-mad --enable-flac --enable-vkeybd --enable-verbose-build --disable-hq-scalers --disable-readline --disable-nasm --disable-mt32emu --datadir=. --with-fluidsynth-prefix=$LOCAL_PATH/../../fluidsynth" + ../setEnvironment.sh sh -c "cd scummvm && env LIBS='-lflac -ltremor -logg -lmad -lz -lgcc -lfluidsynth -lgnustl_static' ./configure --host=androidsdl --enable-zlib --enable-tremor --enable-mad --enable-flac --enable-vkeybd --enable-verbose-build --disable-hq-scalers --disable-readline --disable-nasm --disable-mt32emu --disable-taskbar --datadir=. --with-fluidsynth-prefix=$LOCAL_PATH/../../fluidsynth" +fi +rm -f scummvm/scummvm libapplication.so +../setEnvironment.sh nice make -C scummvm -j4 +if [ -e scummvm/scummvm ]; then + cp -f scummvm/scummvm libapplication.so fi -../setEnvironment.sh make -C scummvm -j2 && cp -f scummvm/scummvm libapplication.so diff --git a/project/jni/application/scummvm/AndroidData/data1.zip b/project/jni/application/scummvm/AndroidData/data1.zip index f72688231..f741d20c3 100644 Binary files a/project/jni/application/scummvm/AndroidData/data1.zip and b/project/jni/application/scummvm/AndroidData/data1.zip differ diff --git a/project/jni/application/scummvm/AndroidData/data2.zip b/project/jni/application/scummvm/AndroidData/data2.zip index eeb2a5995..f62bbc240 100644 Binary files a/project/jni/application/scummvm/AndroidData/data2.zip and b/project/jni/application/scummvm/AndroidData/data2.zip differ diff --git a/project/jni/application/scummvm/scummvm b/project/jni/application/scummvm/scummvm index 56a21d660..74df0b3f6 120000 --- a/project/jni/application/scummvm/scummvm +++ b/project/jni/application/scummvm/scummvm @@ -1 +1 @@ -scummvm-1.3.1 \ No newline at end of file +scummvm-1.4.1 \ No newline at end of file diff --git a/project/jni/application/src b/project/jni/application/src index 92362c4db..104f796a6 120000 --- a/project/jni/application/src +++ b/project/jni/application/src @@ -1 +1 @@ -ufoai \ No newline at end of file +ballfield \ No newline at end of file