diff --git a/package/archlinux/PKGBUILD-emscripten b/package/archlinux/PKGBUILD-emscripten index c1eaf9331..1142dc9ed 100644 --- a/package/archlinux/PKGBUILD-emscripten +++ b/package/archlinux/PKGBUILD-emscripten @@ -7,7 +7,7 @@ arch=('any') url="http://mosra.cz/blog/magnum.php" license=('MIT') depends=('emscripten-corrade') -makedepends=('cmake' 'ninja' 'emscripten' 'corrade') +makedepends=('cmake' 'emscripten' 'corrade') options=('!strip' '!buildflags') _rootdir=$startdir/../../ @@ -20,7 +20,7 @@ build() { cmake .. \ -DCMAKE_MODULE_PATH="$_rootdir/toolchains/modules" \ -DCMAKE_TOOLCHAIN_FILE="$_rootdir/toolchains/generic/Emscripten.cmake" \ - -G Ninja + -DCMAKE_PREFIX_PATH=/usr/lib/emscripten/system fi cd "$_rootdir/build-emscripten" @@ -34,10 +34,10 @@ build() { -DWITH_TGAIMAGECONVERTER=ON \ -DWITH_TGAIMPORTER=ON \ -DWITH_WAVAUDIOIMPORTER=ON - ninja + make } package() { cd "$_rootdir/build-emscripten" - DESTDIR="$pkgdir/" ninja install + DESTDIR="$pkgdir/" make install } diff --git a/package/ci/jenkins-emscripten.xml b/package/ci/jenkins-emscripten.xml index f0615f06f..2252c3a27 100644 --- a/package/ci/jenkins-emscripten.xml +++ b/package/ci/jenkins-emscripten.xml @@ -77,11 +77,10 @@ cmake .. \ -DWITH_TGAIMAGECONVERTER=ON \ -DWITH_TGAIMPORTER=ON \ `#-DWITH_WAVAUDIOIMPORTER=ON` \ - `#-DWITH_MAGNUMINFO=ON` \ - -G Ninja + `#-DWITH_MAGNUMINFO=ON` -ninja -ninja install +make -j +make -j install ]]>