diff --git a/ChangeAppSettings.sh b/ChangeAppSettings.sh index 3472658de..b8b94b756 100755 --- a/ChangeAppSettings.sh +++ b/ChangeAppSettings.sh @@ -690,17 +690,17 @@ cd ../../.. echo Cleaning up dependencies rm -rf project/libs/* project/gen for OUT in obj; do -rm -rf project/$OUT/local/*/objs/sdl_main/* project/$OUT/local/*/libsdl_main.so +rm -rf project/$OUT/local/*/objs*/sdl_main/* project/$OUT/local/*/libsdl_main.so rm -rf project/$OUT/local/*/libsdl-*.so -rm -rf project/$OUT/local/*/objs/sdl-*/src/*/android -rm -rf project/$OUT/local/*/objs/sdl-*/src/video/SDL_video.o -rm -rf project/$OUT/local/*/objs/sdl-*/SDL_renderer_gles.o -rm -rf project/$OUT/local/*/libsdl_fake_stdout.a project/$OUT/local/*/objs/sdl_fake_stdout/* +rm -rf project/$OUT/local/*/objs*/sdl-*/src/*/android +rm -rf project/$OUT/local/*/objs*/sdl-*/src/video/SDL_video.o +rm -rf project/$OUT/local/*/objs*/sdl-*/SDL_renderer_gles.o +rm -rf project/$OUT/local/*/libsdl_fake_stdout.a project/$OUT/local/*/objs*/sdl_fake_stdout/* # Do not rebuild several huge libraries that do not depend on SDL version for LIB in freetype intl jpeg png lua mad stlport tremor xerces xml2; do for ARCH in armeabi armeabi-v7a; do - if [ -e "project/$OUT/local/$ARCH/objs/$LIB" ] ; then - find project/$OUT/local/$ARCH/objs/$LIB -name "*.o" | xargs touch -c + if [ -e "project/$OUT/local/$ARCH/objs*/$LIB" ] ; then + find project/$OUT/local/$ARCH/objs*/$LIB -name "*.o" | xargs touch -c fi done done diff --git a/project/java/MainActivity.java b/project/java/MainActivity.java index ad71b7396..c7877c1a9 100644 --- a/project/java/MainActivity.java +++ b/project/java/MainActivity.java @@ -535,7 +535,7 @@ public class MainActivity extends Activity { // ----- VCMI hack ----- try { - System.out.println("libSDL: Extracting VCMI server"); + //System.out.println("libSDL: Extracting VCMI server"); InputStream in = null; try @@ -602,7 +602,7 @@ public class MainActivity extends Activity { } catch ( Exception eee ) { - System.out.println("libSDL: Error: " + eee.toString()); + //System.out.println("libSDL: Error: " + eee.toString()); } // ----- VCMI hack ----- diff --git a/project/java/Video.java b/project/java/Video.java index fcd7b70a4..c9666451d 100644 --- a/project/java/Video.java +++ b/project/java/Video.java @@ -273,7 +273,7 @@ class DemoRenderer extends GLSurfaceView_SDL.Renderer } catch ( UnsatisfiedLinkError eee ) { - System.out.println("libSDL: error loading lib: " + eee.toString()); + //System.out.println("libSDL: error loading lib: " + eee.toString()); } // ----- VCMI hack ----- diff --git a/project/jni/application/fheroes2/AndroidAppSettings.cfg b/project/jni/application/fheroes2/AndroidAppSettings.cfg index 3a3835434..595f12aa9 100644 --- a/project/jni/application/fheroes2/AndroidAppSettings.cfg +++ b/project/jni/application/fheroes2/AndroidAppSettings.cfg @@ -5,7 +5,7 @@ AppName="Free Heroes 2" AppFullName=net.sourceforge.fheroes2 ScreenOrientation=h InhibitSuspend=n -AppDataDownloadUrl="Game data|data10.zip^Heroes 2 DEMO data files (45 Mb)|http://downloads.pcworld.com/pub/new/fun_and_games/adventure_strategy/h2demo.zip|http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/h2demo.zip/download^MIDI music support (18 Mb)|http://sourceforge.net/projects/libsdl-android/files/timidity.zip/download^Essential map pack (9 Mb)|http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/EssentialMapPack.zip/download^Additional map pack (95 Mb)|http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/AdditionalMapPack.zip/download^Mega map pack (280 Mb)|http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/MegaMapPack.zip/download^Russian translation|:fheroes2.cfg:http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/lang/fheroes2-ru.cfg/download^Czech translation|:fheroes2.cfg:http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/lang/fheroes2-cs.cfg/download^Spanish translation|:fheroes2.cfg:http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/lang/fheroes2-es.cfg/download^French translation|:fheroes2.cfg:http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/lang/fheroes2-fr.cfg/download^Hungarian translation|:fheroes2.cfg:http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/lang/fheroes2-hu.cfg/download^Polish translation|:fheroes2.cfg:http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/lang/fheroes2-pl.cfg/download^Portugese translation|:fheroes2.cfg:http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/lang/fheroes2-pt.cfg/download^Swedish translation|:fheroes2.cfg:http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/lang/fheroes2-sv.cfg/download" +AppDataDownloadUrl="Heroes 2 DEMO data files (45 Mb)|http://downloads.pcworld.com/pub/new/fun_and_games/adventure_strategy/h2demo.zip|http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/h2demo.zip/download^MIDI music support (18 Mb)|http://sourceforge.net/projects/libsdl-android/files/timidity.zip/download^Essential map pack (9 Mb)|http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/EssentialMapPack.zip/download^Additional map pack (95 Mb)|http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/AdditionalMapPack.zip/download^Mega map pack (280 Mb)|http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/MegaMapPack.zip/download^Russian translation|:fheroes2.cfg:http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/lang/fheroes2-ru.cfg/download^Czech translation|:fheroes2.cfg:http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/lang/fheroes2-cs.cfg/download^Spanish translation|:fheroes2.cfg:http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/lang/fheroes2-es.cfg/download^French translation|:fheroes2.cfg:http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/lang/fheroes2-fr.cfg/download^Hungarian translation|:fheroes2.cfg:http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/lang/fheroes2-hu.cfg/download^Polish translation|:fheroes2.cfg:http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/lang/fheroes2-pl.cfg/download^Portugese translation|:fheroes2.cfg:http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/lang/fheroes2-pt.cfg/download^Swedish translation|:fheroes2.cfg:http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/lang/fheroes2-sv.cfg/download^!Game data|data11.zip^!Game fonts|fonts.zip" SdlVideoResize=y SdlVideoResizeKeepAspect=n NeedDepthBuffer=n @@ -25,8 +25,8 @@ RedefinedKeysScreenKb="LCTRL M T H E C SPACE C S L" StartupMenuButtonTimeout=3000 HiddenMenuOptions='KeyboardConfigMainMenu ScreenKeyboardThemeConfig ScreenKeyboardTransparencyConfig' MultiABI=n -AppVersionCode=235815 -AppVersionName="2358.15" +AppVersionCode=238315 +AppVersionName="2383.15" CompiledLibraries="sdl_net sdl_mixer sdl_image sdl_ttf png intl" CustomBuildScript=n AppCflags='-finline-functions -O2 -DWITH_ZLIB -DWITH_MIXER -DWITH_XML -DWITH_IMAGE -DWITH_TTF -DWITH_AI=simple -DWITH_NET' diff --git a/project/jni/application/fheroes2/AndroidData/data10.zip b/project/jni/application/fheroes2/AndroidData/data10.zip deleted file mode 100644 index fe62de805..000000000 Binary files a/project/jni/application/fheroes2/AndroidData/data10.zip and /dev/null differ diff --git a/project/jni/application/fheroes2/AndroidData/data11.zip b/project/jni/application/fheroes2/AndroidData/data11.zip new file mode 100644 index 000000000..b02a68230 Binary files /dev/null and b/project/jni/application/fheroes2/AndroidData/data11.zip differ diff --git a/project/jni/application/fheroes2/AndroidData/fonts.zip b/project/jni/application/fheroes2/AndroidData/fonts.zip new file mode 100644 index 000000000..5d3b35f17 Binary files /dev/null and b/project/jni/application/fheroes2/AndroidData/fonts.zip differ diff --git a/project/jni/application/src b/project/jni/application/src index 8193e5e18..59d41f41e 120000 --- a/project/jni/application/src +++ b/project/jni/application/src @@ -1 +1 @@ -vcmi \ No newline at end of file +fheroes2 \ No newline at end of file