From bcce4ba063120cf27859cc5970744f856d98260e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 16 Jun 2019 18:26:44 +0200 Subject: [PATCH] Doc++, updated credits and changelog. --- doc/changelog.dox | 8 +++++--- doc/credits.dox | 4 ++++ modules/FindMagnum.cmake | 2 ++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/doc/changelog.dox b/doc/changelog.dox index 612e26636..1fdd996ea 100644 --- a/doc/changelog.dox +++ b/doc/changelog.dox @@ -154,11 +154,13 @@ See also: - Added @ref Platform::EmscriptenApplication, implementing a lightweight and more flexible alternative to @ref Platform::Sdl2Application for Emscripten. This is now the recommended application to use for WebGL builds. See - [mosra/magnum#300](https://github.com/mosra/magnum/pull/300). + [mosra/magnum#300](https://github.com/mosra/magnum/pull/300) and + [mosra/magnum-bootstrap#17](https://github.com/mosra/magnum-bootstrap/pull/17). - @ref Platform::Sdl2Application and @ref Platform::GlfwApplication are now DPI-aware on Windows as well. See their documentation, - @ref platforms-windows-hidpi and [mosra/magnum#243](https://github.com/mosra/magnum/issues/243) - for more information. + @ref platforms-windows-hidpi, [mosra/magnum#243](https://github.com/mosra/magnum/issues/243) + and [mosra/magnum#349](https://github.com/mosra/magnum/pull/349) for more + information. - Added @ref Platform::Sdl2Application::glContext() to access the underlying `SDL_GLContext` (see [mosra/magnum#325](https://github.com/mosra/magnum/pull/325)) - Added @ref Platform::Sdl2Application::setMinWindowSize() and diff --git a/doc/credits.dox b/doc/credits.dox index dfb42de39..61f1e04ce 100644 --- a/doc/credits.dox +++ b/doc/credits.dox @@ -99,6 +99,8 @@ Are the below lists missing your name or something's wrong? - **[\@biosek](https://github.com/biosek)** --- documentation fixes - **Borislav Stanimirov** ([\@iboB](https://github.com/iboB)) --- strict weak ordering for @ref Math types +- **Cameron Egbert** ([\@cegbertOculus](https://github.com/cegbertOculus)) + --- fixes to Windows HiDPI support - **Daniel Bloor** ([\@Bluer01](https://github.com/Bluer01)) --- setting old code on fire - **Daniel Guzman** ([\@roig](https://github.com/roig)) --- improvements to @@ -123,6 +125,8 @@ Are the below lists missing your name or something's wrong? improvements to @cb{.cmake} android_create_apk() @ce - **Ivan P.** ([\@uzername](https://github.com/uzername)) --- documentation improvements +- **Jan Dupal** ([\@JanDupal](https://github.com/JanDupal)) --- Homebrew + package for `magnum-bindings` - **Jonathan Hale** ([\@Squareys](https://github.com/Squareys)) --- @ref Audio library enhancements, @ref Platform::GlfwApplication and @ref Platform::EmscriptenApplication implementation, frustum and cone diff --git a/modules/FindMagnum.cmake b/modules/FindMagnum.cmake index 06f08fb51..a55557536 100644 --- a/modules/FindMagnum.cmake +++ b/modules/FindMagnum.cmake @@ -616,6 +616,8 @@ foreach(_component ${Magnum_FIND_COMPONENTS}) set_property(TARGET Magnum::${_component} APPEND PROPERTY INTERFACE_LINK_LIBRARIES android EGL::EGL) + # EmscriptenApplication has no additional dependencies + # GLFW application dependencies elseif(_component STREQUAL GlfwApplication) find_package(GLFW)