diff --git a/CMakeLists.txt b/CMakeLists.txt index 41434767a..151c688a0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -193,6 +193,9 @@ cmake_dependent_option(WITH_OPENGLTESTER "Build OpenGLTester library" OFF "NOT B if(CORRADE_TARGET_EMSCRIPTEN OR CORRADE_TARGET_ANDROID) set(BUILD_STATIC ON) set(BUILD_PLUGINS_STATIC ON) +# Dynamic plugins are not working on iOS or Windows RT at the moment +elseif(CORRADE_TARGET_IOS OR CORRADE_TARGET_WINDOWS_RT) + set(BUILD_PLUGINS_STATIC ON) endif() if(BUILD_STATIC) diff --git a/doc/building.dox b/doc/building.dox index 1ffe24bf5..43f393e72 100644 --- a/doc/building.dox +++ b/doc/building.dox @@ -816,8 +816,8 @@ architectures in `CMAKE_OSX_ARCHITECTURES`. Be sure to set As every application is in its own sandbox, it doesn't make sense to build shared libraries (although it is supported). Enable `BUILD_STATIC` to build -static libraries. You might also have problems using dynamic plugins, enable -`BUILD_PLUGINS_STATIC` to build also plugins as static. OpenGL ES 2.0 is +static libraries. Dynamically loaded plugins are not supported on iOS at the +moment, thus `BUILD_PLUGINS_STATIC` is implicitly enabled. OpenGL ES 2.0 is enabled by default, switch to 3.0 by disabling `TARGET_GLES2`. Please note that `BUILD_MULTITHREADED` is supported only since Xcode 7.3 and diff --git a/package/ci/appveyor-rt.bat b/package/ci/appveyor-rt.bat index a41725eec..a46596acc 100644 --- a/package/ci/appveyor-rt.bat +++ b/package/ci/appveyor-rt.bat @@ -78,6 +78,5 @@ cmake .. ^ -DTARGET_GLES2=%TARGET_GLES2% ^ -DBUILD_TESTS=ON ^ -DBUILD_STATIC=ON ^ - -DBUILD_PLUGINS_STATIC=ON ^ -G "%GENERATOR%" -A x64 || exit /b cmake --build . --config Release -- /m /v:m || exit /b diff --git a/package/ci/travis-ios-simulator.sh b/package/ci/travis-ios-simulator.sh index 39e12f2dc..53e46d2e5 100755 --- a/package/ci/travis-ios-simulator.sh +++ b/package/ci/travis-ios-simulator.sh @@ -60,7 +60,6 @@ cmake .. \ -DWITH_TGAIMPORTER=ON \ -DWITH_WAVAUDIOIMPORTER=ON \ -DBUILD_STATIC=ON \ - -DBUILD_PLUGINS_STATIC=ON \ -DBUILD_TESTS=ON \ -DBUILD_GL_TESTS=ON \ -G Xcode