diff --git a/doc/changelog.dox b/doc/changelog.dox index 3a12bc665..d56006293 100644 --- a/doc/changelog.dox +++ b/doc/changelog.dox @@ -357,6 +357,8 @@ See also: @ref Platform::BasicScreen::textInputEvent() "textInputEvent()" and @ref Platform::BasicScreen::textEditingEvent() "textEditingEvent()" on application implementations that provide such events +- @ref Platform::BasicScreenedApplication is now available also for + @ref Platform::AndroidApplication @subsubsection changelog-latest-changes-text Text library diff --git a/src/Magnum/Platform/AndroidApplication.cpp b/src/Magnum/Platform/AndroidApplication.cpp index d98441b59..ef7d17b31 100644 --- a/src/Magnum/Platform/AndroidApplication.cpp +++ b/src/Magnum/Platform/AndroidApplication.cpp @@ -31,6 +31,7 @@ #include "Magnum/GL/Version.h" #include "Magnum/Platform/GLContext.h" +#include "Magnum/Platform/ScreenedApplication.hpp" #include "Implementation/Egl.h" @@ -316,4 +317,7 @@ void AndroidApplication::exec(android_app* state, Containers::PointeruserData = nullptr; } +template class BasicScreen; +template class BasicScreenedApplication; + }} diff --git a/src/Magnum/Platform/AndroidApplication.h b/src/Magnum/Platform/AndroidApplication.h index c709e89aa..aa9dd63b7 100644 --- a/src/Magnum/Platform/AndroidApplication.h +++ b/src/Magnum/Platform/AndroidApplication.h @@ -800,6 +800,8 @@ header is included this macro is also aliased to @cpp MAGNUM_APPLICATION_MAIN() #ifndef DOXYGEN_GENERATING_OUTPUT #ifndef MAGNUM_APPLICATION_MAIN typedef AndroidApplication Application; +typedef BasicScreen Screen; +typedef BasicScreenedApplication ScreenedApplication; #define MAGNUM_APPLICATION_MAIN(className) MAGNUM_ANDROIDAPPLICATION_MAIN(className) #else #undef MAGNUM_APPLICATION_MAIN diff --git a/src/Magnum/Platform/Screen.h b/src/Magnum/Platform/Screen.h index 6c78a45ab..8ccfa0bce 100644 --- a/src/Magnum/Platform/Screen.h +++ b/src/Magnum/Platform/Screen.h @@ -113,6 +113,7 @@ The following specialization are explicitly compiled into each particular @ref ScreenedApplication.hpp implementation file to avoid linker errors. See @ref compilation-speedup-hpp for more information. +- @ref AndroidApplication "BasicScreen" - @ref GlfwApplication "BasicScreen" - @ref GlxApplication "BasicScreen" - @ref Sdl2Application "BasicScreen" diff --git a/src/Magnum/Platform/ScreenedApplication.h b/src/Magnum/Platform/ScreenedApplication.h index 32e6c6e98..5445ce135 100644 --- a/src/Magnum/Platform/ScreenedApplication.h +++ b/src/Magnum/Platform/ScreenedApplication.h @@ -156,6 +156,7 @@ The following specialization are explicitly compiled into each particular @ref ScreenedApplication.hpp implementation file to avoid linker errors. See @ref compilation-speedup-hpp for more information. +- @ref AndroidApplication "BasicScreenedApplication" - @ref GlfwApplication "BasicScreenedApplication" - @ref GlxApplication "BasicScreenedApplication" - @ref Sdl2Application "BasicScreenedApplication"