Browse Source

Platform: make ScreenedApplication available for AndroidApplication.

pull/364/head
Vladimír Vondruš 7 years ago
parent
commit
e08cdced88
  1. 2
      doc/changelog.dox
  2. 4
      src/Magnum/Platform/AndroidApplication.cpp
  3. 2
      src/Magnum/Platform/AndroidApplication.h
  4. 1
      src/Magnum/Platform/Screen.h
  5. 1
      src/Magnum/Platform/ScreenedApplication.h

2
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

4
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::Pointer<AndroidApp
state->userData = nullptr;
}
template class BasicScreen<AndroidApplication>;
template class BasicScreenedApplication<AndroidApplication>;
}}

2
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<AndroidApplication> Screen;
typedef BasicScreenedApplication<AndroidApplication> ScreenedApplication;
#define MAGNUM_APPLICATION_MAIN(className) MAGNUM_ANDROIDAPPLICATION_MAIN(className)
#else
#undef MAGNUM_APPLICATION_MAIN

1
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<AndroidApplication>"
- @ref GlfwApplication "BasicScreen<GlfwApplication>"
- @ref GlxApplication "BasicScreen<GlxApplication>"
- @ref Sdl2Application "BasicScreen<Sdl2Application>"

1
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<AndroidApplication>"
- @ref GlfwApplication "BasicScreenedApplication<GlfwApplication>"
- @ref GlxApplication "BasicScreenedApplication<GlxApplication>"
- @ref Sdl2Application "BasicScreenedApplication<Sdl2Application>"

Loading…
Cancel
Save