diff --git a/PKGBUILD-emscripten b/PKGBUILD-emscripten index 9875aa68f..30993b1f2 100644 --- a/PKGBUILD-emscripten +++ b/PKGBUILD-emscripten @@ -7,7 +7,7 @@ arch=('any') url="http://mosra.cz/blog/magnum.php" license=('MIT') depends=('emscripten-corrade') -makedepends=('cmake') +makedepends=('cmake' 'ninja') options=(!strip !buildflags) build() { @@ -18,7 +18,8 @@ build() { cmake .. \ -DCMAKE_MODULE_PATH="$startdir/toolchains/modules" \ -DCMAKE_TOOLCHAIN_FILE="$startdir/toolchains/generic/Emscripten.cmake" \ - -DWITH_AUDIO=OFF + -DWITH_AUDIO=OFF \ + -G Ninja fi cd "$startdir/build-emscripten" @@ -32,10 +33,10 @@ build() { -DWITH_TGAIMAGECONVERTER=ON \ -DWITH_TGAIMPORTER=ON \ -DWITH_WAVAUDIOIMPORTER=ON - make + ninja } package() { cd "$startdir/build-emscripten" - make DESTDIR="$pkgdir/" install + DESTDIR="$pkgdir/" ninja install } diff --git a/PKGBUILD-es2 b/PKGBUILD-es2 index 4ee6ac694..3fdc6db93 100644 --- a/PKGBUILD-es2 +++ b/PKGBUILD-es2 @@ -7,7 +7,7 @@ arch=('i686' 'x86_64') url="https://github.com/mosra/magnum" license=('MIT') depends=('corrade' 'openal') -makedepends=('cmake') +makedepends=('cmake' 'ninja') options=(!strip) provides=('magnum-git') @@ -31,8 +31,9 @@ build() { -DWITH_MAGNUMFONT=ON \ -DWITH_TGAIMAGECONVERTER=ON \ -DWITH_TGAIMPORTER=ON \ - -DWITH_WAVAUDIOIMPORTER=ON - make + -DWITH_WAVAUDIOIMPORTER=ON \ + -G Ninja + ninja } check() { @@ -42,5 +43,5 @@ check() { package() { cd "$startdir/build-es2" - make DESTDIR="$pkgdir/" install + DESTDIR="$pkgdir/" ninja install } diff --git a/PKGBUILD-es2desktop b/PKGBUILD-es2desktop index 8fab0570f..ec8961771 100644 --- a/PKGBUILD-es2desktop +++ b/PKGBUILD-es2desktop @@ -7,7 +7,7 @@ arch=('i686' 'x86_64') url="https://github.com/mosra/magnum" license=('MIT') depends=('corrade' 'openal') -makedepends=('cmake') +makedepends=('cmake' 'ninja') options=(!strip) provides=('magnum-git') @@ -33,8 +33,9 @@ build() { -DWITH_MAGNUMFONT=ON \ -DWITH_TGAIMAGECONVERTER=ON \ -DWITH_TGAIMPORTER=ON \ - -DWITH_WAVAUDIOIMPORTER=ON - make + -DWITH_WAVAUDIOIMPORTER=ON \ + -G Ninja + ninja } check() { @@ -44,5 +45,5 @@ check() { package() { cd "$startdir/build-es2desktop" - make DESTDIR="$pkgdir/" install + DESTDIR="$pkgdir/" ninja install } diff --git a/PKGBUILD-es3 b/PKGBUILD-es3 index 6696ba61e..1182f880c 100644 --- a/PKGBUILD-es3 +++ b/PKGBUILD-es3 @@ -7,7 +7,7 @@ arch=('i686' 'x86_64') url="https://github.com/mosra/magnum" license=('MIT') depends=('corrade' 'openal') -makedepends=('cmake') +makedepends=('cmake' 'ninja') options=(!strip) provides=('magnum-git') @@ -31,8 +31,9 @@ build() { -DWITH_MAGNUMFONT=ON \ -DWITH_TGAIMAGECONVERTER=ON \ -DWITH_TGAIMPORTER=ON \ - -DWITH_WAVAUDIOIMPORTER=ON - make + -DWITH_WAVAUDIOIMPORTER=ON \ + -G Ninja + ninja } check() { @@ -42,5 +43,5 @@ check() { package() { cd "$startdir/build-es3" - make DESTDIR="$pkgdir/" install + DESTDIR="$pkgdir/" ninja install } diff --git a/PKGBUILD-mingw32 b/PKGBUILD-mingw32 index 367beefe8..a168e4c5c 100644 --- a/PKGBUILD-mingw32 +++ b/PKGBUILD-mingw32 @@ -7,7 +7,7 @@ arch=('any') url="https://github.com/mosra/magnum" license=('MIT') depends=('mingw32-runtime' 'mingw32-corrade' 'mingw32-freeglut' 'mingw32-openal') -makedepends=('mingw32-gcc' 'cmake' 'corrade') +makedepends=('mingw32-gcc' 'cmake' 'ninja' 'corrade') options=(!buildflags !strip) build() { @@ -25,11 +25,12 @@ build() { -DWITH_MAGNUMFONTCONVERTER=ON \ -DWITH_TGAIMAGECONVERTER=ON \ -DWITH_TGAIMPORTER=ON \ - -DWITH_WAVAUDIOIMPORTER=ON - make + -DWITH_WAVAUDIOIMPORTER=ON \ + -G Ninja + ninja } package() { cd "$startdir/build-win" - make DESTDIR="$pkgdir/" install + DESTDIR="$pkgdir/" ninja install } diff --git a/PKGBUILD-nacl-glibc b/PKGBUILD-nacl-glibc index 775a6ab11..72c00cdd7 100644 --- a/PKGBUILD-nacl-glibc +++ b/PKGBUILD-nacl-glibc @@ -7,7 +7,7 @@ arch=('any') url="https://github.com/mosra/magnum" license=('MIT') depends=('nacl-corrade') -makedepends=('nacl-sdk' 'cmake') +makedepends=('nacl-sdk' 'cmake' 'corrade' 'ninja') options=(!buildflags !strip) build() { @@ -27,8 +27,9 @@ build() { -DWITH_TGAIMAGECONVERTER=ON \ -DWITH_TGAIMPORTER=ON \ -DWITH_WAVAUDIOIMPORTER=ON \ - -DLIB_SUFFIX=/32 - make + -DLIB_SUFFIX=/32 \ + -G Ninja + ninja # Build 64bit mkdir -p "$startdir/build-nacl-glibc-x86-64" @@ -45,17 +46,18 @@ build() { -DWITH_MAGNUMFONTCONVERTER=ON \ -DWITH_TGAIMAGECONVERTER=ON \ -DWITH_TGAIMPORTER=ON \ - -DWITH_WAVAUDIOIMPORTER=ON - make + -DWITH_WAVAUDIOIMPORTER=ON \ + -G Ninja + ninja } package() { # Install 32bit cd "$startdir/build-nacl-glibc-x86-32" - make DESTDIR="$pkgdir/" install + DESTDIR="$pkgdir/" ninja install # Install 64bit (the headers will be overwritten, but they are (and should # be) the same for both versions cd "$startdir/build-nacl-glibc-x86-64" - make DESTDIR="$pkgdir/" install + DESTDIR="$pkgdir/" ninja install } diff --git a/PKGBUILD-nacl-newlib b/PKGBUILD-nacl-newlib index 06c478f19..a92e6e7c2 100644 --- a/PKGBUILD-nacl-newlib +++ b/PKGBUILD-nacl-newlib @@ -7,7 +7,7 @@ arch=('any') url="https://github.com/mosra/magnum" license=('MIT') depends=('nacl-corrade') -makedepends=('nacl-sdk' 'cmake') +makedepends=('nacl-sdk' 'cmake' 'corrade' 'ninja') options=(!buildflags !strip) build() { @@ -29,8 +29,9 @@ build() { -DWITH_TGAIMAGECONVERTER=ON \ -DWITH_TGAIMPORTER=ON \ -DWITH_WAVAUDIOIMPORTER=ON \ - -DLIB_SUFFIX=/32 - make + -DLIB_SUFFIX=/32 \ + -G Ninja + ninja # Build 64bit mkdir -p "$startdir/build-nacl-newlib-x86-64" @@ -49,14 +50,15 @@ build() { -DWITH_MAGNUMFONTCONVERTER=ON \ -DWITH_TGAIMAGECONVERTER=ON \ -DWITH_TGAIMPORTER=ON \ - -DWITH_WAVAUDIOIMPORTER=ON - make + -DWITH_WAVAUDIOIMPORTER=ON \ + -G Ninja + ninja } package() { # Install 32bit cd "$startdir/build-nacl-newlib-x86-32" - make DESTDIR="$pkgdir/" install + DESTDIR="$pkgdir/" ninja install # Strip 32bit binaries /usr/nacl/toolchain/linux_x86_newlib/bin/i686-nacl-strip ${pkgdir}/usr/nacl/bin/*x86-32.nexe @@ -64,7 +66,7 @@ package() { # Install 64bit (the headers will be overwritten, but they are (and should # be) the same for both versions cd "$startdir/build-nacl-newlib-x86-64" - make DESTDIR="$pkgdir/" install + DESTDIR="$pkgdir/" ninja install # Strip 64bit binaries /usr/nacl/toolchain/linux_x86_newlib/bin/x86_64-nacl-strip ${pkgdir}/usr/nacl/bin/*x86-64.nexe diff --git a/PKGBUILD-release b/PKGBUILD-release index c104426d6..1d41b3cfe 100644 --- a/PKGBUILD-release +++ b/PKGBUILD-release @@ -7,7 +7,7 @@ arch=('i686' 'x86_64') url="https://github.com/mosra/magnum" license=('MIT') depends=('corrade' 'openal' 'sdl2' 'freeglut') -makedepends=('cmake') +makedepends=('cmake' 'ninja') provides=('magnum-git') build() { @@ -30,8 +30,9 @@ build() { -DWITH_TGAIMAGECONVERTER=ON \ -DWITH_TGAIMPORTER=ON \ -DWITH_WAVAUDIOIMPORTER=ON \ - -DBUILD_TESTS=TRUE - make + -DBUILD_TESTS=TRUE \ + -G Ninja + ninja } check() { @@ -41,5 +42,5 @@ check() { package() { cd "$startdir/build" - make DESTDIR="$pkgdir/" install + DESTDIR="$pkgdir/" ninja install }