Browse Source

Revert meaningless differences between master and compatibility branch.

Vladimír Vondruš 11 years ago
parent
commit
32791389dc
  1. 6
      README.md
  2. 6
      doc/building.dox
  3. 2
      doc/portability.dox
  4. 1
      src/Magnum/Magnum.h

6
README.md

@ -86,9 +86,9 @@ Minimal dependencies
-------------------- --------------------
* C++ compiler with good C++11 support. Currently there are two compilers * C++ compiler with good C++11 support. Currently there are two compilers
which are tested to have everything needed: **GCC** >= 4.6 and **Clang** which are tested to have everything needed: **GCC** >= 4.7 and **Clang**
>= 3.1. On Windows you can use **MinGW**. GCC 4.5, 4.4 and **MSVC** 2013 >= 3.1. On Windows you can use **MinGW**. GCC 4.6, 4.5, 4.4 and **MSVC**
support involves some ugly workarounds and thus is available only in 2013 support involves some ugly workarounds and thus is available only in
`compatibility` branch. `compatibility` branch.
* **CMake** >= 2.8.9 * **CMake** >= 2.8.9
* **Corrade** - Plugin management and utility library. You can get it at * **Corrade** - Plugin management and utility library. You can get it at

6
doc/building.dox

@ -33,9 +33,9 @@ namespace Magnum {
Minimal set of tools and libraries required for building is: Minimal set of tools and libraries required for building is:
- C++ compiler with good C++11 support. Currently there are two compilers - C++ compiler with good C++11 support. Currently there are two compilers
which are tested to have everything needed: **GCC** >= 4.6 and **Clang** which are tested to have everything needed: **GCC** >= 4.7 and **Clang**
>= 3.1. On Windows you can use **MinGW**. GCC 4.5, 4.4 and **MSVC** 2013 >= 3.1. On Windows you can use **MinGW**. GCC 4.6, 4.5, 4.4 and **MSVC**
support involves some ugly workarounds and thus is available only in 2013 support involves some ugly workarounds and thus is available only in
`compatibility` branch. `compatibility` branch.
- **CMake** >= 2.8.9 - **CMake** >= 2.8.9
- **Corrade** - Plugin management and utility library. See - **Corrade** - Plugin management and utility library. See

2
doc/portability.dox

@ -70,7 +70,7 @@ for more information.
Each feature is marked accordingly if it is not available on some compilers, Each feature is marked accordingly if it is not available on some compilers,
see @ref SceneGraph::DrawableGroup3D for an example. It is up to you (or your see @ref SceneGraph::DrawableGroup3D for an example. It is up to you (or your
platform) which compiler your code will support, code written for e.g. GCC 4.6 platform) which compiler your code will support, code written for e.g. GCC 4.7
will work also on Magnum compiled with support for newer compilers, although will work also on Magnum compiled with support for newer compilers, although
newer compilers may catch errors that weren't spotted by earlier versions. newer compilers may catch errors that weren't spotted by earlier versions.

1
src/Magnum/Magnum.h

@ -576,6 +576,7 @@ typedef ImageReference<3> ImageReference3D;
#ifndef CORRADE_GCC45_COMPATIBILITY #ifndef CORRADE_GCC45_COMPATIBILITY
enum class MeshPrimitive: GLenum; enum class MeshPrimitive: GLenum;
#endif #endif
class Mesh; class Mesh;
class MeshView; class MeshView;

Loading…
Cancel
Save