diff --git a/README.md b/README.md index a65735174..7bf455e59 100644 --- a/README.md +++ b/README.md @@ -53,15 +53,15 @@ Graphics APIs: Platforms: * **Linux** and embedded Linux (natively using GLX/EGL and Xlib or through - SDL2 or GLUT toolkit) [![Build Status](https://travis-ci.org/mosra/magnum.svg?branch=master)](https://travis-ci.org/mosra/magnum) -* **Windows** natively or using ANGLE (through SDL2 or GLUT toolkit) [![Build status](https://ci.appveyor.com/api/projects/status/5b477m034cfaskse/branch/master?svg=true)](https://ci.appveyor.com/project/mosra/magnum/branch/master) -* **OS X** (through SDL2 toolkit) [![Build Status](https://travis-ci.org/mosra/magnum.svg?branch=master)](https://travis-ci.org/mosra/magnum) -* **iOS** (through SDL2 toolkit) + SDL2, GLFW or GLUT toolkit) [![Build Status](https://travis-ci.org/mosra/magnum.svg?branch=master)](https://travis-ci.org/mosra/magnum) [![Coverage Status](https://coveralls.io/repos/github/mosra/magnum/badge.svg?branch=master)](https://coveralls.io/github/mosra/magnum?branch=master) +* **Windows** on both MSVC and MinGW, natively or using ANGLE (through SDL2, GLFW or GLUT toolkit) [![Build Status](https://ci.appveyor.com/api/projects/status/5b477m034cfaskse/branch/master?svg=true)](https://ci.appveyor.com/project/mosra/magnum/branch/master) +* **OS X** (through SDL2 or GLFW toolkit) [![Build Status](https://travis-ci.org/mosra/magnum.svg?branch=master)](https://travis-ci.org/mosra/magnum) +* **iOS** (through SDL2 toolkit) [![Build Status](https://travis-ci.org/mosra/magnum.svg?branch=master)](https://travis-ci.org/mosra/magnum) * **Android** 2.3 (API Level 9) and higher -* **Windows RT** (Store/Phone) using ANGLE (through SDL2 toolkit) +* **Windows RT** (Store/Phone) using ANGLE (through SDL2 toolkit) [![Build Status](https://ci.appveyor.com/api/projects/status/5b477m034cfaskse/branch/master?svg=true)](https://ci.appveyor.com/project/mosra/magnum/branch/master) * **Google Chrome** (through [Native Client](https://developers.google.com/native-client/), both `newlib` and `glibc` toolchains are supported) -* **HTML5/JavaScript** (through [Emscripten](https://github.com/kripken/emscripten/wiki)) +* **HTML5/JavaScript** (through [Emscripten](https://github.com/kripken/emscripten/wiki)) [![Build Status](https://travis-ci.org/mosra/magnum.svg?branch=master)](https://travis-ci.org/mosra/magnum) FEATURES ======== diff --git a/doc/building.dox b/doc/building.dox index e5cac6fbe..7ffe554ee 100644 --- a/doc/building.dox +++ b/doc/building.dox @@ -629,13 +629,15 @@ building your projects for Android. @subsection building-ci-travis Travis -In `package/ci/` there is `travis.yml` file with Linux GCC 4.7 and OSX Clang -configuration. Online at https://travis-ci.org/mosra/magnum. +In `package/ci/` there is `travis.yml` file with Linux GCC 4.7, OSX Clang, iOS +GLES2/GLES3 and Emscripten WebGL1/WebGL2 configuration. Online at +https://travis-ci.org/mosra/magnum. The Linux build has code coverage reports +available online at https://coveralls.io/github/mosra/magnum. @subsection building-ci-appveyor AppVeyor -In `package/ci/` there is `appveyor.yml` file with Windows MSVC configuration. -Online at https://ci.appveyor.com/project/mosra/magnum. +In `package/ci/` there is `appveyor.yml` file with Windows desktop MSVC, MinGW +and Windows RT GLES2/GLES3 configuration. Online at https://ci.appveyor.com/project/mosra/magnum. @subsection building-ci-jenkins Jenkins diff --git a/doc/mainpage.dox b/doc/mainpage.dox index e1af78bb3..9d9a9b9a4 100644 --- a/doc/mainpage.dox +++ b/doc/mainpage.dox @@ -77,9 +77,9 @@ Graphics APIs: Platforms: - **Linux** and embedded Linux (natively using GLX/EGL and Xlib or through - SDL2 or GLUT toolkit) -- **Windows** natively or using ANGLE (through SDL2 or GLUT toolkit) -- **OS X**, **iOS** (through SDL2 toolkit) + SDL2, GLFW or GLUT toolkit) +- **Windows** using both MSVC and MinGW, natively or using ANGLE (through SDL2, GLFW or GLUT toolkit) +- **OS X**, **iOS** (through SDL2 or GLFW toolkit) - **Android** 2.3 (API Level 9) and higher - **Windows RT** (Store/Phone) using ANGLE (through SDL2 toolkit) - **Google Chrome** (through [Native Client](https://developers.google.com/native-client/),