diff --git a/project/java/GLSurfaceView_SDL.java b/project/java/GLSurfaceView_SDL.java index f38eec19a..7854ed831 100644 --- a/project/java/GLSurfaceView_SDL.java +++ b/project/java/GLSurfaceView_SDL.java @@ -922,7 +922,8 @@ public class GLSurfaceView_SDL extends SurfaceView implements SurfaceHolder.Call mEglContext); if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) { - EGL14.eglSwapInterval(mEglDisplay, 1); + // TODO: mixing different EGL APIs, they call the same C API underneath + EGL14.eglSwapInterval(EGL14.eglGetDisplay(EGL14.EGL_DEFAULT_DISPLAY), 1); } GL gl = mEglContext.getGL(); diff --git a/project/jni/application/ballfield/AndroidAppSettings.cfg b/project/jni/application/ballfield/AndroidAppSettings.cfg index 2deffa62a..eef046bfd 100644 --- a/project/jni/application/ballfield/AndroidAppSettings.cfg +++ b/project/jni/application/ballfield/AndroidAppSettings.cfg @@ -213,7 +213,7 @@ FirstStartMenuOptions='SettingsMenu.DummyMenu' # Specify architectures to compile, 'all' or 'y' to compile for all architectures. # Available architectures: armeabi armeabi-v7a armeabi-v7a-hard x86 mips -MultiABI='armeabi-v7a' +MultiABI='armeabi-v7a armeabi' # Minimum amount of RAM application requires, in Mb, SDL will print warning to user if it's lower AppMinimumRAM=0 @@ -221,7 +221,7 @@ AppMinimumRAM=0 # 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 # 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="sdl_image android_support" +CompiledLibraries="sdl_image" # Application uses custom build script AndroidBuild.sh instead of Android.mk (y) or (n) CustomBuildScript=n diff --git a/project/jni/application/ballfield/ballfield.cpp b/project/jni/application/ballfield/ballfield.cpp index da96a32fe..d4feed749 100644 --- a/project/jni/application/ballfield/ballfield.cpp +++ b/project/jni/application/ballfield/ballfield.cpp @@ -556,6 +556,7 @@ int main(int argc, char* argv[]) memset(gamepads, 0, sizeof(gamepads)); __android_log_print(ANDROID_LOG_INFO, "Ballfield", "sizeof(int) %d long %d long long %d size_t %d", sizeof(int), sizeof(long), sizeof(long long), sizeof(size_t)); + /* wchar_t ss[256]; const wchar_t *ss2 = L"String 2 ЕНГ ---"; swprintf(ss, 256, L"String ЙЦУК --- %ls", ss2); @@ -569,6 +570,7 @@ int main(int argc, char* argv[]) sprintf(ss4, "%ls", ss); } __android_log_print(ANDROID_LOG_VERBOSE, "Ballfield", "swprintf: len %d data %s: %s", wcslen(ss), ss3, ss4); + */ __android_log_print(ANDROID_LOG_VERBOSE, "Ballfield", "On-screen buttons:"); for(i = 0; i < SDL_ANDROID_SCREENKEYBOARD_BUTTON_NUM; i++)