From c34260d603cc5b9a281aa5e3a6ccbc2ddfe39372 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 27 Feb 2014 21:20:03 +0100 Subject: [PATCH] Platform: even more doc++. --- src/Magnum/Platform/NaClApplication.h | 4 +++- src/Magnum/Platform/Sdl2Application.h | 5 +++-- src/Magnum/Platform/WindowlessGlxApplication.h | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/Magnum/Platform/NaClApplication.h b/src/Magnum/Platform/NaClApplication.h index efcb7d80f..d04899d54 100644 --- a/src/Magnum/Platform/NaClApplication.h +++ b/src/Magnum/Platform/NaClApplication.h @@ -111,7 +111,9 @@ You can then open `MyApplication` through your webserver in Chrome (e.g. ## General usage -In CMake you need to request `%NaClApplication` component, add +For CMake you need to copy `FindOpenGLES2.cmake` from `modules/` directory in +%Magnum source to `modules/` dir in your project (so it is able to find OpenGL +ES). Request `%NaClApplication` component, add `${MAGNUM_NACLAPPLICATION_INCLUDE_DIRS}` to include path and link to `${MAGNUM_NACLAPPLICATION_LIBRARIES}`. If no other application is requested, you can also use generic `${MAGNUM_APPLICATION_INCLUDE_DIRS}` and diff --git a/src/Magnum/Platform/Sdl2Application.h b/src/Magnum/Platform/Sdl2Application.h index 60009586b..eb5289388 100644 --- a/src/Magnum/Platform/Sdl2Application.h +++ b/src/Magnum/Platform/Sdl2Application.h @@ -114,8 +114,9 @@ e.g. `http://localhost/emscripten/MyApplication.html`). ## General usage For CMake you need to copy `FindSDL2.cmake` from `modules/` directory in -%Magnum source to `modules/` dir in your project (so it is able to find SDL2), -request `%Sdl2Application` component, add `${MAGNUM_SDL2APPLICATION_INCLUDE_DIRS}` +%Magnum source to `modules/` dir in your project (so it is able to find SDL2). +In case of Emscripten you need also `FindOpenGLES2.cmake`. Request +`%Sdl2Application` component, add `${MAGNUM_SDL2APPLICATION_INCLUDE_DIRS}` to include path and link to `${MAGNUM_SDL2APPLICATION_LIBRARIES}`. If no other application is requested, you can also use generic `${MAGNUM_APPLICATION_INCLUDE_DIRS}` and `${MAGNUM_APPLICATION_LIBRARIES}` aliases to simplify porting. See diff --git a/src/Magnum/Platform/WindowlessGlxApplication.h b/src/Magnum/Platform/WindowlessGlxApplication.h index 024ce2fa7..1269a5914 100644 --- a/src/Magnum/Platform/WindowlessGlxApplication.h +++ b/src/Magnum/Platform/WindowlessGlxApplication.h @@ -132,7 +132,8 @@ class WindowlessGlxApplication { * @brief Execute application * @return Value for returning from `main()` * - * See @ref MAGNUM_WINDOWLESSAPPLICATION_MAIN() for usage information. + * See @ref MAGNUM_WINDOWLESSGLXAPPLICATION_MAIN() for usage + * information. */ virtual int exec() = 0;