diff --git a/PKGBUILD b/PKGBUILD index 9e1cdf500..8ea54a4b0 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -27,6 +27,7 @@ build() { cmake .. \ -DCMAKE_BUILD_TYPE=Debug \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DWITH_AUDIO=ON \ -DWITH_GLUTAPPLICATION=ON \ -DWITH_GLXAPPLICATION=ON \ -DWITH_SDL2APPLICATION=ON \ @@ -35,7 +36,11 @@ build() { -DWITH_TGAIMAGECONVERTER=ON \ -DWITH_TGAIMPORTER=ON \ -DWITH_WAVAUDIOIMPORTER=ON \ - -DBUILD_TESTS=TRUE \ + -DWITH_DISTANCEFIELDCONVERTER=ON \ + -DWITH_FONTCONVERTER=ON \ + -DWITH_MAGNUMINFO=ON \ + -DBUILD_TESTS=ON \ + -DBUILD_GL_TESTS=ON \ -G Ninja ninja } diff --git a/PKGBUILD-gcc46 b/PKGBUILD-gcc46 index 4912b65e7..2f64c0717 100644 --- a/PKGBUILD-gcc46 +++ b/PKGBUILD-gcc46 @@ -26,6 +26,7 @@ build() { cmake .. \ -DCMAKE_BUILD_TYPE=Debug \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DWITH_AUDIO=ON \ -DWITH_GLUTAPPLICATION=ON \ -DWITH_GLXAPPLICATION=ON \ -DWITH_SDL2APPLICATION=ON \ @@ -34,7 +35,11 @@ build() { -DWITH_TGAIMAGECONVERTER=ON \ -DWITH_TGAIMPORTER=ON \ -DWITH_WAVAUDIOIMPORTER=ON \ - -DBUILD_TESTS=TRUE + -DWITH_DISTANCEFIELDCONVERTER=ON \ + -DWITH_FONTCONVERTER=ON \ + -DWITH_MAGNUMINFO=ON \ + -DBUILD_TESTS=ON \ + -DBUILD_GL_TESTS=ON ninja } diff --git a/PKGBUILD-gcc47 b/PKGBUILD-gcc47 index 64b6b4d7b..ec8a8bc5f 100644 --- a/PKGBUILD-gcc47 +++ b/PKGBUILD-gcc47 @@ -26,6 +26,7 @@ build() { cmake .. \ -DCMAKE_BUILD_TYPE=Debug \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DWITH_AUDIO=ON \ -DWITH_GLUTAPPLICATION=ON \ -DWITH_GLXAPPLICATION=ON \ -DWITH_SDL2APPLICATION=ON \ @@ -34,7 +35,11 @@ build() { -DWITH_TGAIMAGECONVERTER=ON \ -DWITH_TGAIMPORTER=ON \ -DWITH_WAVAUDIOIMPORTER=ON \ - -DBUILD_TESTS=TRUE + -DWITH_DISTANCEFIELDCONVERTER=ON \ + -DWITH_FONTCONVERTER=ON \ + -DWITH_MAGNUMINFO=ON \ + -DBUILD_TESTS=ON \ + -DBUILD_GL_TESTS=ON ninja } diff --git a/src/Plugins/MagnumFont/MagnumFont.cpp b/src/Plugins/MagnumFont/MagnumFont.cpp index fdb5996db..a74551e29 100644 --- a/src/Plugins/MagnumFont/MagnumFont.cpp +++ b/src/Plugins/MagnumFont/MagnumFont.cpp @@ -36,8 +36,8 @@ namespace Magnum { namespace Text { struct MagnumFont::Data { - #ifdef CORRADE_GCC44_COMPATIBILITY - Data(Utility::Configuration&& conf, Trade::ImageData2D&& image, int, int): conf(std::move(conf)), image(std::move(image)) {} + #ifdef CORRADE_GCC46_COMPATIBILITY + explicit Data(Utility::Configuration&& conf, Trade::ImageData2D&& image, std::unordered_map&& glyphId, std::vector&& glyphAdvance): conf(std::move(conf)), image(std::move(image)), glyphId(std::move(glyphId)), glyphAdvance(std::move(glyphAdvance)) {} #endif Utility::Configuration conf; diff --git a/src/Plugins/MagnumFontConverter/MagnumFontConverter.cpp b/src/Plugins/MagnumFontConverter/MagnumFontConverter.cpp index 1e6f381b2..8bea885a8 100644 --- a/src/Plugins/MagnumFontConverter/MagnumFontConverter.cpp +++ b/src/Plugins/MagnumFontConverter/MagnumFontConverter.cpp @@ -63,9 +63,17 @@ std::vector>> MagnumFont should stay at position 0 */ std::unordered_map glyphIdMap; glyphIdMap.reserve(cache.glyphCount()); + #ifndef CORRADE_GCC46_COMPATIBILITY glyphIdMap.emplace(0, 0); + #else + glyphIdMap.insert({0, 0}); + #endif for(const std::pair>& glyph: cache) + #ifndef CORRADE_GCC46_COMPATIBILITY glyphIdMap.emplace(glyph.first, glyphIdMap.size()); + #else + glyphIdMap.insert({glyph.first, glyphIdMap.size()}); + #endif /** @todo Save only glyphs contained in @p characters */