diff --git a/CMakeLists.txt b/CMakeLists.txt index 355f2a956..6212470df 100644 --- a/CMakeLists.txt +++ b/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() diff --git a/doc/opengl-support.dox b/doc/opengl-support.dox index bfd5ea51e..c6d91e1bf 100644 --- a/doc/opengl-support.dox +++ b/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 diff --git a/package/archlinux/PKGBUILD-mingw-w64 b/package/archlinux/PKGBUILD-mingw-w64 new file mode 100644 index 000000000..04ffc3918 --- /dev/null +++ b/package/archlinux/PKGBUILD-mingw-w64 @@ -0,0 +1,59 @@ +# Author: mosra +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 +} diff --git a/src/Magnum/AbstractShaderProgram.h b/src/Magnum/AbstractShaderProgram.h index 2cebca4df..c1fb50393 100644 --- a/src/Magnum/AbstractShaderProgram.h +++ b/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}, diff --git a/src/Magnum/Platform/WindowlessGlxApplication.h b/src/Magnum/Platform/WindowlessGlxApplication.h index eef2649db..d6ed8c633 100644 --- a/src/Magnum/Platform/WindowlessGlxApplication.h +++ b/src/Magnum/Platform/WindowlessGlxApplication.h @@ -29,8 +29,6 @@ * @brief Class @ref Magnum::Platform::WindowlessGlxApplication */ -#include - #include "Magnum/OpenGL.h" #include #include diff --git a/src/Magnum/Shader.h b/src/Magnum/Shader.h index 57aca5bf0..71f83f31e 100644 --- a/src/Magnum/Shader.h +++ b/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}, diff --git a/src/Magnum/TextureTools/distancefieldconverter.cpp b/src/Magnum/TextureTools/distancefieldconverter.cpp index bc386bb31..3787e7a77 100644 --- a/src/Magnum/TextureTools/distancefieldconverter.cpp +++ b/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") diff --git a/src/Magnum/Timeline.h b/src/Magnum/Timeline.h index ca05840b8..ede5cd9d7 100644 --- a/src/Magnum/Timeline.h +++ b/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) */ diff --git a/toolchains b/toolchains index ac87e416a..f1228ede0 160000 --- a/toolchains +++ b/toolchains @@ -1 +1 @@ -Subproject commit ac87e416a0e8052cde520426aa83e007d1e0e391 +Subproject commit f1228ede05fc03db403711bf1458261a7758e68d