diff --git a/doc/building.dox b/doc/building.dox index 747192216..0b2a34d84 100644 --- a/doc/building.dox +++ b/doc/building.dox @@ -504,12 +504,11 @@ in `axes/hudson.matrix.TextAxis` or via the web interface later. Magnum-Compatibility-GLTests depend on active X11 session, thus they should be run from Jenkins instance running on graphical user session. -There is also MinGW32, MinGW-w64, Emscripten and NaCl configuration, add or -update them with the commands below. See @ref building-crosscompiling for more -information about setting up the crosscompilers and `toolchains/` submodule. -For Emscripten you need also **Node.js** installed to run the tests. +There is also MinGW-w64, Emscripten and NaCl configuration, add or update them +with the commands below. See @ref building-crosscompiling for more information +about setting up the crosscompilers and `toolchains/` submodule. For Emscripten +you need also **Node.js** installed to run the tests. - java -jar jenkins-cli.jar -s http://your-jenkins-server Magnum-MinGW32 < jenkins-mingw32.xml java -jar jenkins-cli.jar -s http://your-jenkins-server Magnum-MinGW-w64 < jenkins-mingw-w64.xml java -jar jenkins-cli.jar -s http://your-jenkins-server Magnum-Emscripten < jenkins-emscripten.xml java -jar jenkins-cli.jar -s http://your-jenkins-server Magnum-NaCl < jenkins-nacl.xml diff --git a/package/ci/jenkins-mingw32.xml b/package/ci/jenkins-mingw32.xml deleted file mode 100644 index 9cf01d7de..000000000 --- a/package/ci/jenkins-mingw32.xml +++ /dev/null @@ -1,129 +0,0 @@ - - - - - - -1 - 10 - -1 - -1 - - false - - - 2 - - - git://github.com/mosra/magnum.git - - - - - */master - - - false - - - - true - - - - - true - false - false - false - - false - Magnum - - - libraries - - static - dynamic - - - - compatibility - - - deprecated - - - - - - - - - - - - - Errors while running CTest - false - true - true - - - - - true - - - - - UNSTABLE - 1 - YELLOW - true - - - . - diff --git a/src/Magnum/Platform/AndroidApplication.cpp b/src/Magnum/Platform/AndroidApplication.cpp index 436b02da1..5d9e949e0 100644 --- a/src/Magnum/Platform/AndroidApplication.cpp +++ b/src/Magnum/Platform/AndroidApplication.cpp @@ -34,7 +34,23 @@ namespace Magnum { namespace Platform { -/** @todo Delegating constructors when support for GCC 4.6 can be dropped */ +struct AndroidApplication::LogOutput { + LogOutput(); + + Utility::AndroidLogStreamBuffer debugBuffer, warningBuffer, errorBuffer; + std::ostream debugStream, warningStream, errorStream; +}; + +AndroidApplication::LogOutput::LogOutput(): + debugBuffer(Utility::AndroidLogStreamBuffer::LogPriority::Info, "magnum"), + warningBuffer(Utility::AndroidLogStreamBuffer::LogPriority::Warning, "magnum"), + errorBuffer(Utility::AndroidLogStreamBuffer::LogPriority::Error, "magnum"), + debugStream(&debugBuffer), warningStream(&warningBuffer), errorStream(&errorBuffer) +{ + Debug::setOutput(&debugStream); + Warning::setOutput(&warningStream); + Error::setOutput(&errorStream); +} AndroidApplication::AndroidApplication(const Arguments& arguments, const Configuration& configuration): _state(arguments) { initialize(); @@ -59,24 +75,6 @@ AndroidApplication::~AndroidApplication() { eglTerminate(_display); } -struct AndroidApplication::LogOutput { - LogOutput(); - - Utility::AndroidLogStreamBuffer debugBuffer, warningBuffer, errorBuffer; - std::ostream debugStream, warningStream, errorStream; -}; - -AndroidApplication::LogOutput::LogOutput(): - debugBuffer(Utility::AndroidLogStreamBuffer::LogPriority::Info, "magnum"), - warningBuffer(Utility::AndroidLogStreamBuffer::LogPriority::Warning, "magnum"), - errorBuffer(Utility::AndroidLogStreamBuffer::LogPriority::Error, "magnum"), - debugStream(&debugBuffer), warningStream(&warningBuffer), errorStream(&errorBuffer) -{ - Debug::setOutput(&debugStream); - Warning::setOutput(&warningStream); - Error::setOutput(&errorStream); -} - void AndroidApplication::initialize() { /* Redirect debug output to Android log */ _logOutput.reset(new LogOutput); diff --git a/src/Magnum/Shaders/MeshVisualizer.cpp b/src/Magnum/Shaders/MeshVisualizer.cpp index 8d29c4fd4..0696cbbb8 100644 --- a/src/Magnum/Shaders/MeshVisualizer.cpp +++ b/src/Magnum/Shaders/MeshVisualizer.cpp @@ -63,7 +63,7 @@ MeshVisualizer::MeshVisualizer(const Flags flags): flags(flags), transformationP .addSource(flags & Flag::NoGeometryShader ? "#define NO_GEOMETRY_SHADER\n" : "") #ifdef MAGNUM_TARGET_WEBGL .addSource("#define SUBSCRIPTING_WORKAROUND\n") - #elif defined(MAGNUM_TARGET_GLES) + #elif defined(MAGNUM_TARGET_GLES2) .addSource(Context::current()->detectedDriver() & Context::DetectedDriver::ProbablyAngle ? "#define SUBSCRIPTING_WORKAROUND\n" : "") #endif diff --git a/src/MagnumPlugins/ObjImporter/ObjImporter.cpp b/src/MagnumPlugins/ObjImporter/ObjImporter.cpp index 603033f2e..de3ae8d08 100644 --- a/src/MagnumPlugins/ObjImporter/ObjImporter.cpp +++ b/src/MagnumPlugins/ObjImporter/ObjImporter.cpp @@ -38,7 +38,7 @@ #include "Magnum/Math/Vector3.h" #include "Magnum/Trade/MeshData3D.h" -#ifdef CORRADE_TARGET_NACL_NEWLIB +#if defined(CORRADE_TARGET_NACL_NEWLIB) || defined(CORRADE_TARGET_ANDROID) #include #endif @@ -66,12 +66,12 @@ template Math::Vector extractFloatData(std::strin Math::Vector output; - #ifdef CORRADE_TARGET_NACL_NEWLIB + #if defined(CORRADE_TARGET_NACL_NEWLIB) || defined(CORRADE_TARGET_ANDROID) std::istringstream in; #endif for(std::size_t i = 0; i != size; ++i) { - #ifndef CORRADE_TARGET_NACL_NEWLIB + #if !defined(CORRADE_TARGET_NACL_NEWLIB) && !defined(CORRADE_TARGET_ANDROID) output[i] = std::stof(data[i]); #else in.str(data[i]); @@ -80,7 +80,7 @@ template Math::Vector extractFloatData(std::strin } if(data.size() == size+1) { - #ifndef CORRADE_TARGET_NACL_NEWLIB + #if !defined(CORRADE_TARGET_NACL_NEWLIB) && !defined(CORRADE_TARGET_ANDROID) *extra = std::stof(data.back()); #else in.str(data.back()); @@ -381,7 +381,7 @@ std::optional ObjImporter::doMesh3D(UnsignedInt id) { } /* Position indices */ - #ifndef CORRADE_TARGET_NACL_NEWLIB + #if !defined(CORRADE_TARGET_NACL_NEWLIB) && !defined(CORRADE_TARGET_ANDROID) positionIndices.push_back(std::stoul(indices[0]) - positionIndexOffset); #else std::istringstream in(indices[0]); @@ -392,7 +392,7 @@ std::optional ObjImporter::doMesh3D(UnsignedInt id) { /* Texture coordinates */ if(indices.size() == 2 || (indices.size() == 3 && !indices[1].empty())) { - #ifndef CORRADE_TARGET_NACL_NEWLIB + #if !defined(CORRADE_TARGET_NACL_NEWLIB) && !defined(CORRADE_TARGET_ANDROID) textureCoordinateIndices.push_back(std::stoul(indices[1]) - textureCoordinateIndexOffset); #else in.str(indices[1]); @@ -403,7 +403,7 @@ std::optional ObjImporter::doMesh3D(UnsignedInt id) { /* Normal indices */ if(indices.size() == 3) { - #ifndef CORRADE_TARGET_NACL_NEWLIB + #if !defined(CORRADE_TARGET_NACL_NEWLIB) && !defined(CORRADE_TARGET_ANDROID) normalIndices.push_back(std::stoul(indices[2]) - normalIndexOffset); #else in.str(indices[2]);