diff --git a/project/jni/Makefile.prebuilt b/project/jni/Makefile.prebuilt index d81f8ed26..22dfdbbc5 100644 --- a/project/jni/Makefile.prebuilt +++ b/project/jni/Makefile.prebuilt @@ -1,7 +1,7 @@ # Makefile to build precompiled libraries, which cannot be built using standard NDK makefiles # TODO: libboost, libffmpeg, libpython (used only in GemRB) -ARCHES32 := armeabi-v7a x86 +ARCHES32 := armeabi armeabi-v7a x86 ARCHES64 := arm64-v8a x86_64 ICONV := $(foreach ARCH, $(ARCHES32) $(ARCHES64), iconv/lib/$(ARCH)/libiconv.so iconv/lib/$(ARCH)/libcharset.so) diff --git a/project/jni/application/openttd/AndroidAppSettings.cfg b/project/jni/application/openttd/AndroidAppSettings.cfg index 0906089a9..236b883be 100644 --- a/project/jni/application/openttd/AndroidAppSettings.cfg +++ b/project/jni/application/openttd/AndroidAppSettings.cfg @@ -119,7 +119,7 @@ AppNeedsTwoButtonMouse=y # Right mouse button can do long-press/drag&drop action, necessary for some games (y) or (n) # If you disable it, swiping with two fingers will send mouse wheel events -RightMouseButtonLongPress= +RightMouseButtonLongPress=y # Show SDL mouse cursor, for applications that do not draw cursor at all (y) or (n) ShowMouseCursor=n @@ -168,7 +168,7 @@ AppUsesOrientationSensor= MoveMouseWithGyroscope= # Application uses multitouch (y) or (n), multitouch events are passed as SDL_JOYBALLMOTION events for the joystick 0 -AppUsesMultitouch=n +AppUsesMultitouch=y # Application records audio (it will use any available source, such a s microphone) # API is defined in file SDL_android.h: int SDL_ANDROID_OpenAudioRecording(SDL_AudioSpec *spec); void SDL_ANDROID_CloseAudioRecording(void); diff --git a/project/jni/iconv/src b/project/jni/iconv/src index 48bca80cd..fe9f93a3e 160000 --- a/project/jni/iconv/src +++ b/project/jni/iconv/src @@ -1 +1 @@ -Subproject commit 48bca80cd268760a8c4af1865a35b2b747152c40 +Subproject commit fe9f93a3ec6883f9f42dc41f2a58d68ef54385db diff --git a/project/jni/icuuc/src b/project/jni/icuuc/src index 48bca80cd..fe9f93a3e 160000 --- a/project/jni/icuuc/src +++ b/project/jni/icuuc/src @@ -1 +1 @@ -Subproject commit 48bca80cd268760a8c4af1865a35b2b747152c40 +Subproject commit fe9f93a3ec6883f9f42dc41f2a58d68ef54385db