Merge branch 'master' into compatibility

CMakeLists.txt

@@ -61,7 +61,7 @@ elseif(CORRADE_TARGET_ANDROID)
 # X11, GLX and EGL-specific application libraries
 elseif(CORRADE_TARGET_UNIX AND NOT APPLE)
     option(WITH_GLXAPPLICATION "Build GlxApplication library" OFF)
-    cmake_dependent_option(WITH_WINDOWLESSGLXAPPLICATION "Build WindowlessGlxApplication library" OFF "NOT WITH_MAGNUMINFO;NOT WITH_DISTANCEFIELDCONVERTER" ON)
+    cmake_dependent_option(WITH_WINDOWLESSGLXAPPLICATION "Build WindowlessGlxApplication library" OFF "NOT WITH_MAGNUMINFO;NOT WITH_FONTCONVERTER;NOT WITH_DISTANCEFIELDCONVERTER" ON)
     cmake_dependent_option(WITH_XEGLAPPLICATION "Build XEglApplication library" OFF "TARGET_GLES" OFF)
 endif()
 

doc/opengl-support.dox

@@ -271,7 +271,7 @@ supported.
 @es_extension{OES,depth24}                   | done
 @es_extension{OES,element_index_uint}        | done
 @es_extension{OES,rgb8_rgba8}                | done (desktop-compatible subset)
-@es_extension{OES,texture_3D}                | missing limit query
+@es_extension{OES,texture_3D}                | done
 @es_extension2{OES,texture_half_float_linear,OES_texture_float_linear} | done
 @es_extension{OES,texture_float_linear}      | done
 @es_extension2{OES,texture_half_float,OES_texture_float} | done

package/archlinux/PKGBUILD-mingw-w64

@@ -0,0 +1,59 @@
+# Author: mosra <mosra@centrum.cz>
+pkgname=mingw-w64-magnum
+pkgver=dev
+pkgrel=1
+pkgdesc="C++11 and OpenGL 2D/3D graphics engine (mingw-w64)"
+arch=('any')
+url="http://mosra.cz/blog/magnum.php"
+license=('MIT')
+depends=('mingw-w64-crt' 'mingw-w64-corrade' 'mingw-w64-freeglut' 'mingw-w64-sdl2' 'mingw-w64-openal')
+makedepends=('mingw-w64-gcc' 'cmake' 'ninja' 'corrade')
+options=('!buildflags' '!strip' 'staticlibs')
+
+build() {
+    mkdir -p "$startdir/build-mingw-w64-32"
+    cd "$startdir/build-mingw-w64-32"
+
+    cmake .. \
+        -DCMAKE_TOOLCHAIN_FILE=../toolchains/archlinux/basic-mingw-w64-32.cmake \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DCMAKE_INSTALL_PREFIX=/usr/i686-w64-mingw32 \
+        -DWITH_AUDIO=ON \
+        -DWITH_GLUTAPPLICATION=ON \
+        -DWITH_MAGNUMFONT=ON \
+        -DWITH_MAGNUMFONTCONVERTER=ON \
+        -DWITH_OBJIMPORTER=ON \
+        -DWITH_SDL2APPLICATION=ON \
+        -DWITH_TGAIMAGECONVERTER=ON \
+        -DWITH_TGAIMPORTER=ON \
+        -DWITH_WAVAUDIOIMPORTER=ON \
+        -G Ninja
+    ninja
+
+    mkdir -p "$startdir/build-mingw-w64-64"
+    cd "$startdir/build-mingw-w64-64"
+
+    cmake .. \
+        -DCMAKE_TOOLCHAIN_FILE=../toolchains/archlinux/basic-mingw-w64-64.cmake \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DCMAKE_INSTALL_PREFIX=/usr/x86_64-w64-mingw32 \
+        -DWITH_AUDIO=ON \
+        -DWITH_GLUTAPPLICATION=ON \
+        -DWITH_MAGNUMFONT=ON \
+        -DWITH_MAGNUMFONTCONVERTER=ON \
+        -DWITH_OBJIMPORTER=ON \
+        -DWITH_SDL2APPLICATION=ON \
+        -DWITH_TGAIMAGECONVERTER=ON \
+        -DWITH_TGAIMPORTER=ON \
+        -DWITH_WAVAUDIOIMPORTER=ON \
+        -G Ninja
+    ninja
+}
+
+package() {
+  cd "$startdir/build-mingw-w64-32"
+  DESTDIR="$pkgdir/" ninja install/strip
+
+  cd "$startdir/build-mingw-w64-64"
+  DESTDIR="$pkgdir/" ninja install/strip
+}

src/Magnum/AbstractShaderProgram.h

@@ -560,7 +560,7 @@ class MAGNUM_EXPORT AbstractShaderProgram: public AbstractObject {
          * everything succeeded. Linker message (if any) is printed to error
          * output. All attached shaders must be compiled with
          * @ref Shader::compile() before linking. The operation is batched in a
-         * way that allows the driver to link multiple shaders simultaenously
+         * way that allows the driver to link multiple shaders simultaneously
          * (i.e. in multiple threads).
          * @see @fn_gl{LinkProgram}, @fn_gl{GetProgram} with
          *      @def_gl{LINK_STATUS} and @def_gl{INFO_LOG_LENGTH},

src/Magnum/Platform/WindowlessGlxApplication.h

@@ -29,8 +29,6 @@
  * @brief Class @ref Magnum::Platform::WindowlessGlxApplication
  */
 
-#include <utility>
-
 #include "Magnum/OpenGL.h"
 #include <GL/glx.h>
 #include <X11/Xlib.h>

src/Magnum/Shader.h

@@ -437,12 +437,12 @@ class MAGNUM_EXPORT Shader: public AbstractObject {
         #endif
 
         /**
-         * @brief Compile multiple shaders simultaenously
+         * @brief Compile multiple shaders simultaneously
          *
          * Returns `false` if compilation of any shader failed, `true` if
          * everything succeeded. Compiler messages (if any) are printed to
          * error output. The operation is batched in a way that allows the
-         * driver to perform multiple compilations simultaenously (i.e. in
+         * driver to perform multiple compilations simultaneously (i.e. in
          * multiple threads).
          * @see @fn_gl{ShaderSource}, @fn_gl{CompileShader}, @fn_gl{GetShader}
          *      with @def_gl{COMPILE_STATUS} and @def_gl{INFO_LOG_LENGTH},

src/Magnum/TextureTools/distancefieldconverter.cpp

@@ -52,7 +52,7 @@ class DistanceFieldConverter: public Platform::WindowlessApplication {
         Utility::Arguments args;
 };
 
-DistanceFieldConverter::DistanceFieldConverter(const Arguments& arguments): WindowlessGlxApplication(arguments, nullptr) {
+DistanceFieldConverter::DistanceFieldConverter(const Arguments& arguments): Platform::WindowlessApplication(arguments, nullptr) {
     args.addArgument("input").setHelp("input", "input image")
         .addArgument("output").setHelp("output", "output image")
         .addOption("importer", "TgaImporter").setHelp("image importer plugin")

src/Magnum/Timeline.h

@@ -78,7 +78,7 @@ void MyApplication::drawEvent() {
     timeline.nextFrame();
 }
 @endcode
-@todo FPS should be governed by Application (imagine more than one simultaenous
+@todo FPS should be governed by Application (imagine more than one simultaneous
     timeline and the harm it could do, also vsync etc. can't be handled in
     platform-independent way here)
 */

toolchains

@@ -1 +1 @@
-Subproject commit ac87e416a0e8052cde520426aa83e007d1e0e391
+Subproject commit f1228ede05fc03db403711bf1458261a7758e68d