diff --git a/package/archlinux/PKGBUILD b/package/archlinux/PKGBUILD index 7f63eeedc..0d196fa52 100644 --- a/package/archlinux/PKGBUILD +++ b/package/archlinux/PKGBUILD @@ -25,6 +25,7 @@ build() { -DCMAKE_BUILD_TYPE=Debug \ -DCMAKE_INSTALL_PREFIX=/usr \ -DWITH_AUDIO=ON \ + -DWITH_SHAPES=ON \ -DWITH_GLFWAPPLICATION=ON \ -DWITH_GLUTAPPLICATION=ON \ -DWITH_GLXAPPLICATION=ON \ diff --git a/package/archlinux/PKGBUILD-android-arm64 b/package/archlinux/PKGBUILD-android-arm64 index 5b04b4e8a..bab830c9a 100644 --- a/package/archlinux/PKGBUILD-android-arm64 +++ b/package/archlinux/PKGBUILD-android-arm64 @@ -32,6 +32,7 @@ build() { -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/opt/android-ndk/platforms/android-22/arch-arm64/usr \ -DMAGNUM_INCLUDE_INSTALL_PREFIX=/opt/android-ndk/sysroot/usr \ + -DWITH_SHAPES=ON \ -DWITH_ANYAUDIOIMPORTER=OFF \ -DWITH_ANYIMAGECONVERTER=ON \ -DWITH_ANYIMAGEIMPORTER=ON \ diff --git a/package/archlinux/PKGBUILD-clang b/package/archlinux/PKGBUILD-clang index 2ffabfd38..5dd5ed251 100644 --- a/package/archlinux/PKGBUILD-clang +++ b/package/archlinux/PKGBUILD-clang @@ -29,6 +29,7 @@ build() { -DCMAKE_BUILD_TYPE=Debug \ -DCMAKE_INSTALL_PREFIX=/usr \ -DWITH_AUDIO=ON \ + -DWITH_SHAPES=ON \ -DWITH_GLUTAPPLICATION=ON \ -DWITH_GLFWAPPLICATION=ON \ -DWITH_GLXAPPLICATION=ON \ diff --git a/package/archlinux/PKGBUILD-clang-addressanitizer b/package/archlinux/PKGBUILD-clang-addressanitizer index 5fdf4c5b5..836549cdd 100644 --- a/package/archlinux/PKGBUILD-clang-addressanitizer +++ b/package/archlinux/PKGBUILD-clang-addressanitizer @@ -30,6 +30,7 @@ build() { -DCMAKE_BUILD_TYPE=Debug \ -DCMAKE_INSTALL_PREFIX=/usr \ -DWITH_AUDIO=ON \ + -DWITH_SHAPES=ON \ -DWITH_GLUTAPPLICATION=ON \ -DWITH_GLFWAPPLICATION=ON \ -DWITH_GLXAPPLICATION=ON \ diff --git a/package/archlinux/PKGBUILD-clang-libc++ b/package/archlinux/PKGBUILD-clang-libc++ index 395db8837..8609c1b06 100644 --- a/package/archlinux/PKGBUILD-clang-libc++ +++ b/package/archlinux/PKGBUILD-clang-libc++ @@ -31,6 +31,7 @@ build() { -DCMAKE_BUILD_TYPE=Debug \ -DCMAKE_INSTALL_PREFIX=/usr \ -DWITH_AUDIO=ON \ + -DWITH_SHAPES=ON \ -DWITH_GLFWAPPLICATION=ON \ -DWITH_GLUTAPPLICATION=ON \ -DWITH_GLXAPPLICATION=ON \ diff --git a/package/archlinux/PKGBUILD-coverage b/package/archlinux/PKGBUILD-coverage index a9fde1484..402d99108 100644 --- a/package/archlinux/PKGBUILD-coverage +++ b/package/archlinux/PKGBUILD-coverage @@ -27,6 +27,7 @@ build() { -DCMAKE_BUILD_TYPE=Debug \ -DCMAKE_INSTALL_PREFIX=/usr \ -DWITH_AUDIO=ON \ + -DWITH_SHAPES=ON \ -DWITH_GLFWAPPLICATION=ON \ -DWITH_GLUTAPPLICATION=ON \ -DWITH_GLXAPPLICATION=ON \ diff --git a/package/archlinux/PKGBUILD-emscripten b/package/archlinux/PKGBUILD-emscripten index 835f9e388..b7f4a70f3 100644 --- a/package/archlinux/PKGBUILD-emscripten +++ b/package/archlinux/PKGBUILD-emscripten @@ -30,6 +30,7 @@ build() { -DCMAKE_INSTALL_PREFIX=/usr/lib/emscripten/system \ -DMAGNUM_DEPLOY_PREFIX=/srv/http/emscripten \ -DWITH_AUDIO=ON \ + -DWITH_SHAPES=ON \ -DWITH_SDL2APPLICATION=ON \ -WDITH_WINDOWLESSEGLAPPLICATION=ON \ -DWITH_ANYAUDIOIMPORTER=ON \ diff --git a/package/archlinux/PKGBUILD-emscripten-wasm b/package/archlinux/PKGBUILD-emscripten-wasm index b1797a032..0759e5b74 100644 --- a/package/archlinux/PKGBUILD-emscripten-wasm +++ b/package/archlinux/PKGBUILD-emscripten-wasm @@ -30,6 +30,7 @@ build() { -DCMAKE_INSTALL_PREFIX=/usr/lib/emscripten/system \ -DMAGNUM_DEPLOY_PREFIX=/srv/http/emscripten \ -DWITH_AUDIO=ON \ + -DWITH_SHAPES=ON \ -DWITH_SDL2APPLICATION=ON \ -WDITH_WINDOWLESSEGLAPPLICATION=ON \ -DWITH_ANYAUDIOIMPORTER=ON \ diff --git a/package/archlinux/PKGBUILD-emscripten-wasm-webgl2 b/package/archlinux/PKGBUILD-emscripten-wasm-webgl2 index 79c51e2e1..1c7285109 100644 --- a/package/archlinux/PKGBUILD-emscripten-wasm-webgl2 +++ b/package/archlinux/PKGBUILD-emscripten-wasm-webgl2 @@ -31,6 +31,7 @@ build() { -DMAGNUM_DEPLOY_PREFIX=/srv/http/emscripten-webgl2 \ -DTARGET_GLES2=OFF \ -DWITH_AUDIO=ON \ + -DWITH_SHAPES=ON \ -DWITH_SDL2APPLICATION=ON \ -WDITH_WINDOWLESSEGLAPPLICATION=ON \ -DWITH_ANYAUDIOIMPORTER=ON \ diff --git a/package/archlinux/PKGBUILD-emscripten-webgl2 b/package/archlinux/PKGBUILD-emscripten-webgl2 index 62316e833..d043aaced 100644 --- a/package/archlinux/PKGBUILD-emscripten-webgl2 +++ b/package/archlinux/PKGBUILD-emscripten-webgl2 @@ -31,6 +31,7 @@ build() { -DMAGNUM_DEPLOY_PREFIX=/srv/http/emscripten-webgl2 \ -DTARGET_GLES2=OFF \ -DWITH_AUDIO=ON \ + -DWITH_SHAPES=ON \ -DWITH_SDL2APPLICATION=ON \ -WDITH_WINDOWLESSEGLAPPLICATION=ON \ -DWITH_ANYAUDIOIMPORTER=ON \ diff --git a/package/archlinux/PKGBUILD-es2 b/package/archlinux/PKGBUILD-es2 index 9419ad5f9..8e5a98821 100644 --- a/package/archlinux/PKGBUILD-es2 +++ b/package/archlinux/PKGBUILD-es2 @@ -23,6 +23,7 @@ build() { -DTARGET_GLES=ON \ -DTARGET_GLES2=ON \ -DWITH_AUDIO=ON \ + -DWITH_SHAPES=ON \ -DWITH_XEGLAPPLICATION=ON \ -DWITH_WINDOWLESSEGLAPPLICATION=ON \ -DWITH_EGLCONTEXT=ON \ diff --git a/package/archlinux/PKGBUILD-es2desktop b/package/archlinux/PKGBUILD-es2desktop index f579fa3f5..621286c2e 100644 --- a/package/archlinux/PKGBUILD-es2desktop +++ b/package/archlinux/PKGBUILD-es2desktop @@ -24,6 +24,7 @@ build() { -DTARGET_GLES2=ON \ -DTARGET_DESKTOP_GLES=ON \ -DWITH_AUDIO=ON \ + -DWITH_SHAPES=ON \ -DWITH_GLFWAPPLICATION=ON \ -DWITH_GLXAPPLICATION=ON \ -DWITH_SDL2APPLICATION=ON \ diff --git a/package/archlinux/PKGBUILD-es3 b/package/archlinux/PKGBUILD-es3 index aabc69284..d7af5e202 100644 --- a/package/archlinux/PKGBUILD-es3 +++ b/package/archlinux/PKGBUILD-es3 @@ -23,6 +23,7 @@ build() { -DTARGET_GLES=ON \ -DTARGET_GLES2=OFF \ -DWITH_AUDIO=ON \ + -DWITH_SHAPES=ON \ -DWITH_XEGLAPPLICATION=ON \ -DWITH_WINDOWLESSEGLAPPLICATION=ON \ -DWITH_EGLCONTEXT=ON \ diff --git a/package/archlinux/PKGBUILD-es3desktop b/package/archlinux/PKGBUILD-es3desktop index a9d197560..e5a4a3df7 100644 --- a/package/archlinux/PKGBUILD-es3desktop +++ b/package/archlinux/PKGBUILD-es3desktop @@ -24,6 +24,7 @@ build() { -DTARGET_GLES2=OFF \ -DTARGET_DESKTOP_GLES=ON \ -DWITH_AUDIO=ON \ + -DWITH_SHAPES=ON \ -DWITH_GLFWAPPLICATION=ON \ -DWITH_GLXAPPLICATION=ON \ -DWITH_SDL2APPLICATION=ON \ diff --git a/package/archlinux/PKGBUILD-gcc47 b/package/archlinux/PKGBUILD-gcc47 index c6966922b..b739ce3e5 100644 --- a/package/archlinux/PKGBUILD-gcc47 +++ b/package/archlinux/PKGBUILD-gcc47 @@ -33,6 +33,7 @@ build() { -DCMAKE_BUILD_TYPE=Debug \ -DCMAKE_INSTALL_PREFIX=/usr \ -DWITH_AUDIO=ON \ + -DWITH_SHAPES=ON \ -DWITH_GLFWAPPLICATION=ON \ -DWITH_GLUTAPPLICATION=ON \ -DWITH_GLXAPPLICATION=ON \ diff --git a/package/archlinux/PKGBUILD-mingw-w64 b/package/archlinux/PKGBUILD-mingw-w64 index 90ae5ec37..83cb327d2 100644 --- a/package/archlinux/PKGBUILD-mingw-w64 +++ b/package/archlinux/PKGBUILD-mingw-w64 @@ -21,6 +21,7 @@ build() { -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr/i686-w64-mingw32 \ -DWITH_AUDIO=ON \ + -DWITH_SHAPES=ON \ -DWITH_GLUTAPPLICATION=ON \ -DWITH_SDL2APPLICATION=ON \ -DWITH_WINDOWLESSWGLAPPLICATION=ON \ diff --git a/package/archlinux/PKGBUILD-release b/package/archlinux/PKGBUILD-release index b369a916a..ca99d21cc 100644 --- a/package/archlinux/PKGBUILD-release +++ b/package/archlinux/PKGBUILD-release @@ -21,6 +21,7 @@ build() { -DCMAKE_BUILD_TYPE=Debug \ -DCMAKE_INSTALL_PREFIX=/usr \ -DWITH_AUDIO=ON \ + -DWITH_SHAPES=ON \ -DWITH_GLFWAPPLICATION=ON \ -DWITH_GLUTAPPLICATION=ON \ -DWITH_GLXAPPLICATION=ON \ @@ -57,6 +58,7 @@ build() { -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DWITH_AUDIO=ON \ + -DWITH_SHAPES=ON \ -DWITH_GLUTAPPLICATION=ON \ -DWITH_GLXAPPLICATION=ON \ -DWITH_SDL2APPLICATION=ON \ diff --git a/package/ci/appveyor-desktop-gles.bat b/package/ci/appveyor-desktop-gles.bat index 62046e486..f51616c59 100644 --- a/package/ci/appveyor-desktop-gles.bat +++ b/package/ci/appveyor-desktop-gles.bat @@ -26,6 +26,7 @@ cmake .. ^ -DTARGET_GLES2=%TARGET_GLES2% ^ -DTARGET_DESKTOP_GLES=ON ^ -DWITH_AUDIO=ON ^ + -DWITH_SHAPES=ON ^ -DWITH_SDL2APPLICATION=OFF ^ -DWITH_WINDOWLESSWGLAPPLICATION=ON ^ -DWITH_WGLCONTEXT=ON ^ diff --git a/package/ci/appveyor-desktop-mingw.bat b/package/ci/appveyor-desktop-mingw.bat index 0736ebbe0..ea3971f3d 100644 --- a/package/ci/appveyor-desktop-mingw.bat +++ b/package/ci/appveyor-desktop-mingw.bat @@ -25,6 +25,7 @@ cmake .. ^ -DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^ -DCMAKE_PREFIX_PATH="%APPVEYOR_BUILD_FOLDER%/SDL;%APPVEYOR_BUILD_FOLDER%/openal" ^ -DWITH_AUDIO=ON ^ + -DWITH_SHAPES=ON ^ -DWITH_SDL2APPLICATION=ON ^ -DWITH_WINDOWLESSWGLAPPLICATION=ON ^ -DWITH_WGLCONTEXT=ON ^ diff --git a/package/ci/appveyor-desktop.bat b/package/ci/appveyor-desktop.bat index 4f6324de0..90a838dda 100644 --- a/package/ci/appveyor-desktop.bat +++ b/package/ci/appveyor-desktop.bat @@ -23,6 +23,7 @@ cmake .. ^ -DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^ -DCMAKE_PREFIX_PATH="%APPVEYOR_BUILD_FOLDER%/SDL;%APPVEYOR_BUILD_FOLDER%/openal" ^ -DWITH_AUDIO=ON ^ + -DWITH_SHAPES=ON ^ -DWITH_SDL2APPLICATION=ON ^ -DWITH_GLFWAPPLICATION=ON ^ -DWITH_WINDOWLESSWGLAPPLICATION=ON ^ diff --git a/package/ci/travis-android-arm.sh b/package/ci/travis-android-arm.sh index 1793b46eb..1e71e8eb9 100755 --- a/package/ci/travis-android-arm.sh +++ b/package/ci/travis-android-arm.sh @@ -52,6 +52,7 @@ cmake .. \ -DCMAKE_BUILD_TYPE=Release \ -DTARGET_GLES2=$TARGET_GLES2 \ -DWITH_AUDIO=OFF \ + -DWITH_SHAPES=ON \ -DWITH_VK=OFF \ -DWITH_ANDROIDAPPLICATION=ON \ -DWITH_EGLCONTEXT=ON \ diff --git a/package/ci/travis-desktop-gles.sh b/package/ci/travis-desktop-gles.sh index da5227726..bd22c1876 100755 --- a/package/ci/travis-desktop-gles.sh +++ b/package/ci/travis-desktop-gles.sh @@ -24,6 +24,7 @@ cmake .. \ -DTARGET_GLES2=$TARGET_GLES2 \ -DTARGET_DESKTOP_GLES=ON \ -DWITH_AUDIO=ON \ + -DWITH_SHAPES=ON \ -DWITH_VK=OFF \ -DWITH_GLFWAPPLICATION=OFF \ -DWITH_SDL2APPLICATION=OFF \ diff --git a/package/ci/travis-desktop.sh b/package/ci/travis-desktop.sh index a503b167b..a13f0480a 100755 --- a/package/ci/travis-desktop.sh +++ b/package/ci/travis-desktop.sh @@ -25,6 +25,7 @@ cmake .. \ -DCMAKE_BUILD_TYPE=Debug \ -DVULKAN_LIBRARY=$HOME/libvulkan.so \ -DWITH_AUDIO=ON \ + -DWITH_SHAPES=$BUILD_DEPRECATED \ -DWITH_VK=OFF \ -DWITH_GLFWAPPLICATION=ON \ -DWITH_GLUTAPPLICATION=$WITH_GLUTAPPLICATION \ diff --git a/package/ci/travis-emscripten.sh b/package/ci/travis-emscripten.sh index de55a52e7..66cca6c75 100755 --- a/package/ci/travis-emscripten.sh +++ b/package/ci/travis-emscripten.sh @@ -49,6 +49,7 @@ cmake .. \ -DCMAKE_INSTALL_PREFIX=$HOME/deps \ -DCMAKE_FIND_ROOT_PATH=$HOME/deps \ -DWITH_AUDIO=ON \ + -DWITH_SHAPES=ON \ -DWITH_VK=OFF \ -DWITH_SDL2APPLICATION=ON \ -WDITH_WINDOWLESSEGLAPPLICATION=ON \ diff --git a/package/ci/travis-ios-simulator.sh b/package/ci/travis-ios-simulator.sh index 196d49cb5..ccf8a3934 100755 --- a/package/ci/travis-ios-simulator.sh +++ b/package/ci/travis-ios-simulator.sh @@ -45,6 +45,7 @@ cmake .. \ -DCMAKE_PREFIX_PATH="$HOME/deps;$TRAVIS_BUILD_DIR/sdl2" \ -DTARGET_GLES2=$TARGET_GLES2 \ -DWITH_AUDIO=ON \ + -DWITH_SHAPES=ON \ -DWITH_VK=OFF \ -DWITH_SDL2APPLICATION=ON \ -DWITH_WINDOWLESSIOSAPPLICATION=ON \