From 21076d0caed6bea673abb5c316ea14cb804bead9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 7 Sep 2015 02:22:52 +0200 Subject: [PATCH] Advertise MSVC 2015 support, add AppVeyor badge. --- README.md | 10 +++++----- doc/building.dox | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 5aa814358..f7bd57747 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,7 @@ Platforms: * **Linux** and embedded Linux (natively using GLX/EGL and Xlib or through SDL2 or GLUT toolkit) -* **Windows** (through SDL2 or GLUT toolkit) +* **Windows** (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) * **Android** 2.3 (API Level 9) and higher * **Google Chrome** (through [Native Client](https://developers.google.com/native-client/), @@ -85,10 +85,10 @@ comprehensive guide for building, packaging and crosscompiling. Minimal dependencies -------------------- -* C++ compiler with good C++11 support. Currently there are two compilers - which are tested to have everything needed: **GCC** >= 4.7 and **Clang** - >= 3.1. On Windows you can use **MinGW**. GCC 4.6, 4.5, 4.4 and **MSVC** - 2013 support involves some ugly workarounds and thus is available only in +- C++ compiler with good C++11 support. Compilers which are tested to have + everything needed are **GCC** >= 4.7, **Clang** >= 3.1 and **MSVC** 2015. + On Windows you can also use **MinGW**. GCC 4.6, 4.5, 4.4 and MSVC 2013 + support involves some ugly workarounds and thus is available only in `compatibility` branch. * **CMake** >= 2.8.9 * **Corrade** - Plugin management and utility library. You can get it at diff --git a/doc/building.dox b/doc/building.dox index 289bda680..633299909 100644 --- a/doc/building.dox +++ b/doc/building.dox @@ -32,10 +32,10 @@ namespace Magnum { Minimal set of tools and libraries required for building is: -- C++ compiler with good C++11 support. Currently there are two compilers - which are tested to have everything needed: **GCC** >= 4.7 and **Clang** - >= 3.1. On Windows you can use **MinGW**. GCC 4.6, 4.5, 4.4 and **MSVC** - 2013 support involves some ugly workarounds and thus is available only in +- C++ compiler with good C++11 support. Compilers which are tested to have + everything needed are **GCC** >= 4.7, **Clang** >= 3.1 and **MSVC** 2015. + On Windows you can also use **MinGW**. GCC 4.6, 4.5, 4.4 and MSVC 2013 + support involves some ugly workarounds and thus is available only in `compatibility` branch. - **CMake** >= 2.8.9 - **Corrade** - Plugin management and utility library. See