ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Use ninja also in all other development PKGBUILDs.

pull/34/head
Vladimír Vondruš 13 years ago
parent
b2b6eb0c92
commit
db1f68d1e8
8 changed files with 48 additions and 38 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      PKGBUILD-emscripten
  2. 9
      PKGBUILD-es2
  3. 9
      PKGBUILD-es2desktop
  4. 9
      PKGBUILD-es3
  5. 9
      PKGBUILD-mingw32
  6. 16
      PKGBUILD-nacl-glibc
  7. 16
      PKGBUILD-nacl-newlib
  8. 9
      PKGBUILD-release

9
PKGBUILD-emscripten
Unescape View File

@ -7,7 +7,7 @@ arch=('any')
url="http://mosra.cz/blog/magnum.php" url="http://mosra.cz/blog/magnum.php"
license=('MIT') license=('MIT')
depends=('emscripten-corrade') depends=('emscripten-corrade')
makedepends=('cmake') makedepends=('cmake' 'ninja')
options=(!strip !buildflags) options=(!strip !buildflags)
build() { build() {
@ -18,7 +18,8 @@ build() {
cmake .. \ cmake .. \
-DCMAKE_MODULE_PATH="$startdir/toolchains/modules" \ -DCMAKE_MODULE_PATH="$startdir/toolchains/modules" \
-DCMAKE_TOOLCHAIN_FILE="$startdir/toolchains/generic/Emscripten.cmake" \ -DCMAKE_TOOLCHAIN_FILE="$startdir/toolchains/generic/Emscripten.cmake" \
-DWITH_AUDIO=OFF -DWITH_AUDIO=OFF \
-G Ninja
fi fi
cd "$startdir/build-emscripten" cd "$startdir/build-emscripten"
@ -32,10 +33,10 @@ build() {
-DWITH_TGAIMAGECONVERTER=ON \ -DWITH_TGAIMAGECONVERTER=ON \
-DWITH_TGAIMPORTER=ON \ -DWITH_TGAIMPORTER=ON \
-DWITH_WAVAUDIOIMPORTER=ON -DWITH_WAVAUDIOIMPORTER=ON
make ninja
} }
package() { package() {
cd "$startdir/build-emscripten" cd "$startdir/build-emscripten"
make DESTDIR="$pkgdir/" install DESTDIR="$pkgdir/" ninja install
} }

9
PKGBUILD-es2
Unescape View File

@ -7,7 +7,7 @@ arch=('i686' 'x86_64')
url="https://github.com/mosra/magnum" url="https://github.com/mosra/magnum"
license=('MIT') license=('MIT')
depends=('corrade' 'openal') depends=('corrade' 'openal')
makedepends=('cmake') makedepends=('cmake' 'ninja')
options=(!strip) options=(!strip)
provides=('magnum-git') provides=('magnum-git')
@ -31,8 +31,9 @@ build() {
-DWITH_MAGNUMFONT=ON \ -DWITH_MAGNUMFONT=ON \
-DWITH_TGAIMAGECONVERTER=ON \ -DWITH_TGAIMAGECONVERTER=ON \
-DWITH_TGAIMPORTER=ON \ -DWITH_TGAIMPORTER=ON \
-DWITH_WAVAUDIOIMPORTER=ON -DWITH_WAVAUDIOIMPORTER=ON \
make -G Ninja
ninja
} }
check() { check() {
@ -42,5 +43,5 @@ check() {
package() { package() {
cd "$startdir/build-es2" cd "$startdir/build-es2"
make DESTDIR="$pkgdir/" install DESTDIR="$pkgdir/" ninja install
} }

9
PKGBUILD-es2desktop
Unescape View File

@ -7,7 +7,7 @@ arch=('i686' 'x86_64')
url="https://github.com/mosra/magnum" url="https://github.com/mosra/magnum"
license=('MIT') license=('MIT')
depends=('corrade' 'openal') depends=('corrade' 'openal')
makedepends=('cmake') makedepends=('cmake' 'ninja')
options=(!strip) options=(!strip)
provides=('magnum-git') provides=('magnum-git')
@ -33,8 +33,9 @@ build() {
-DWITH_MAGNUMFONT=ON \ -DWITH_MAGNUMFONT=ON \
-DWITH_TGAIMAGECONVERTER=ON \ -DWITH_TGAIMAGECONVERTER=ON \
-DWITH_TGAIMPORTER=ON \ -DWITH_TGAIMPORTER=ON \
-DWITH_WAVAUDIOIMPORTER=ON -DWITH_WAVAUDIOIMPORTER=ON \
make -G Ninja
ninja
} }
check() { check() {
@ -44,5 +45,5 @@ check() {
package() { package() {
cd "$startdir/build-es2desktop" cd "$startdir/build-es2desktop"
make DESTDIR="$pkgdir/" install DESTDIR="$pkgdir/" ninja install
} }

9
PKGBUILD-es3
Unescape View File

@ -7,7 +7,7 @@ arch=('i686' 'x86_64')
url="https://github.com/mosra/magnum" url="https://github.com/mosra/magnum"
license=('MIT') license=('MIT')
depends=('corrade' 'openal') depends=('corrade' 'openal')
makedepends=('cmake') makedepends=('cmake' 'ninja')
options=(!strip) options=(!strip)
provides=('magnum-git') provides=('magnum-git')
@ -31,8 +31,9 @@ build() {
-DWITH_MAGNUMFONT=ON \ -DWITH_MAGNUMFONT=ON \
-DWITH_TGAIMAGECONVERTER=ON \ -DWITH_TGAIMAGECONVERTER=ON \
-DWITH_TGAIMPORTER=ON \ -DWITH_TGAIMPORTER=ON \
-DWITH_WAVAUDIOIMPORTER=ON -DWITH_WAVAUDIOIMPORTER=ON \
make -G Ninja
ninja
} }
check() { check() {
@ -42,5 +43,5 @@ check() {
package() { package() {
cd "$startdir/build-es3" cd "$startdir/build-es3"
make DESTDIR="$pkgdir/" install DESTDIR="$pkgdir/" ninja install
} }

9
PKGBUILD-mingw32
Unescape View File

@ -7,7 +7,7 @@ arch=('any')
url="https://github.com/mosra/magnum" url="https://github.com/mosra/magnum"
license=('MIT') license=('MIT')
depends=('mingw32-runtime' 'mingw32-corrade' 'mingw32-freeglut' 'mingw32-openal') depends=('mingw32-runtime' 'mingw32-corrade' 'mingw32-freeglut' 'mingw32-openal')
makedepends=('mingw32-gcc' 'cmake' 'corrade') makedepends=('mingw32-gcc' 'cmake' 'ninja' 'corrade')
options=(!buildflags !strip) options=(!buildflags !strip)
build() { build() {
@ -25,11 +25,12 @@ build() {
-DWITH_MAGNUMFONTCONVERTER=ON \ -DWITH_MAGNUMFONTCONVERTER=ON \
-DWITH_TGAIMAGECONVERTER=ON \ -DWITH_TGAIMAGECONVERTER=ON \
-DWITH_TGAIMPORTER=ON \ -DWITH_TGAIMPORTER=ON \
-DWITH_WAVAUDIOIMPORTER=ON -DWITH_WAVAUDIOIMPORTER=ON \
make -G Ninja
ninja
} }
package() { package() {
cd "$startdir/build-win" cd "$startdir/build-win"
make DESTDIR="$pkgdir/" install DESTDIR="$pkgdir/" ninja install
} }

16
PKGBUILD-nacl-glibc
Unescape View File

@ -7,7 +7,7 @@ arch=('any')
url="https://github.com/mosra/magnum" url="https://github.com/mosra/magnum"
license=('MIT') license=('MIT')
depends=('nacl-corrade') depends=('nacl-corrade')
makedepends=('nacl-sdk' 'cmake') makedepends=('nacl-sdk' 'cmake' 'corrade' 'ninja')
options=(!buildflags !strip) options=(!buildflags !strip)
build() { build() {
@ -27,8 +27,9 @@ build() {
-DWITH_TGAIMAGECONVERTER=ON \ -DWITH_TGAIMAGECONVERTER=ON \
-DWITH_TGAIMPORTER=ON \ -DWITH_TGAIMPORTER=ON \
-DWITH_WAVAUDIOIMPORTER=ON \ -DWITH_WAVAUDIOIMPORTER=ON \
-DLIB_SUFFIX=/32 -DLIB_SUFFIX=/32 \
make -G Ninja
ninja
# Build 64bit # Build 64bit
mkdir -p "$startdir/build-nacl-glibc-x86-64" mkdir -p "$startdir/build-nacl-glibc-x86-64"
@ -45,17 +46,18 @@ build() {
-DWITH_MAGNUMFONTCONVERTER=ON \ -DWITH_MAGNUMFONTCONVERTER=ON \
-DWITH_TGAIMAGECONVERTER=ON \ -DWITH_TGAIMAGECONVERTER=ON \
-DWITH_TGAIMPORTER=ON \ -DWITH_TGAIMPORTER=ON \
-DWITH_WAVAUDIOIMPORTER=ON -DWITH_WAVAUDIOIMPORTER=ON \
make -G Ninja
ninja
} }
package() { package() {
# Install 32bit # Install 32bit
cd "$startdir/build-nacl-glibc-x86-32" 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 # Install 64bit (the headers will be overwritten, but they are (and should
# be) the same for both versions # be) the same for both versions
cd "$startdir/build-nacl-glibc-x86-64" cd "$startdir/build-nacl-glibc-x86-64"
make DESTDIR="$pkgdir/" install DESTDIR="$pkgdir/" ninja install
} }

16
PKGBUILD-nacl-newlib
Unescape View File

@ -7,7 +7,7 @@ arch=('any')
url="https://github.com/mosra/magnum" url="https://github.com/mosra/magnum"
license=('MIT') license=('MIT')
depends=('nacl-corrade') depends=('nacl-corrade')
makedepends=('nacl-sdk' 'cmake') makedepends=('nacl-sdk' 'cmake' 'corrade' 'ninja')
options=(!buildflags !strip) options=(!buildflags !strip)
build() { build() {
@ -29,8 +29,9 @@ build() {
-DWITH_TGAIMAGECONVERTER=ON \ -DWITH_TGAIMAGECONVERTER=ON \
-DWITH_TGAIMPORTER=ON \ -DWITH_TGAIMPORTER=ON \
-DWITH_WAVAUDIOIMPORTER=ON \ -DWITH_WAVAUDIOIMPORTER=ON \
-DLIB_SUFFIX=/32 -DLIB_SUFFIX=/32 \
make -G Ninja
ninja
# Build 64bit # Build 64bit
mkdir -p "$startdir/build-nacl-newlib-x86-64" mkdir -p "$startdir/build-nacl-newlib-x86-64"
@ -49,14 +50,15 @@ build() {
-DWITH_MAGNUMFONTCONVERTER=ON \ -DWITH_MAGNUMFONTCONVERTER=ON \
-DWITH_TGAIMAGECONVERTER=ON \ -DWITH_TGAIMAGECONVERTER=ON \
-DWITH_TGAIMPORTER=ON \ -DWITH_TGAIMPORTER=ON \
-DWITH_WAVAUDIOIMPORTER=ON -DWITH_WAVAUDIOIMPORTER=ON \
make -G Ninja
ninja
} }
package() { package() {
# Install 32bit # Install 32bit
cd "$startdir/build-nacl-newlib-x86-32" cd "$startdir/build-nacl-newlib-x86-32"
make DESTDIR="$pkgdir/" install DESTDIR="$pkgdir/" ninja install
# Strip 32bit binaries # Strip 32bit binaries
/usr/nacl/toolchain/linux_x86_newlib/bin/i686-nacl-strip ${pkgdir}/usr/nacl/bin/*x86-32.nexe /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 # Install 64bit (the headers will be overwritten, but they are (and should
# be) the same for both versions # be) the same for both versions
cd "$startdir/build-nacl-newlib-x86-64" cd "$startdir/build-nacl-newlib-x86-64"
make DESTDIR="$pkgdir/" install DESTDIR="$pkgdir/" ninja install
# Strip 64bit binaries # Strip 64bit binaries
/usr/nacl/toolchain/linux_x86_newlib/bin/x86_64-nacl-strip ${pkgdir}/usr/nacl/bin/*x86-64.nexe /usr/nacl/toolchain/linux_x86_newlib/bin/x86_64-nacl-strip ${pkgdir}/usr/nacl/bin/*x86-64.nexe

9
PKGBUILD-release
Unescape View File

@ -7,7 +7,7 @@ arch=('i686' 'x86_64')
url="https://github.com/mosra/magnum" url="https://github.com/mosra/magnum"
license=('MIT') license=('MIT')
depends=('corrade' 'openal' 'sdl2' 'freeglut') depends=('corrade' 'openal' 'sdl2' 'freeglut')
makedepends=('cmake') makedepends=('cmake' 'ninja')
provides=('magnum-git') provides=('magnum-git')
build() { build() {
@ -30,8 +30,9 @@ build() {
-DWITH_TGAIMAGECONVERTER=ON \ -DWITH_TGAIMAGECONVERTER=ON \
-DWITH_TGAIMPORTER=ON \ -DWITH_TGAIMPORTER=ON \
-DWITH_WAVAUDIOIMPORTER=ON \ -DWITH_WAVAUDIOIMPORTER=ON \
-DBUILD_TESTS=TRUE -DBUILD_TESTS=TRUE \
make -G Ninja
ninja
} }
check() { check() {
@ -41,5 +42,5 @@ check() {
package() { package() {
cd "$startdir/build" cd "$startdir/build"
make DESTDIR="$pkgdir/" install DESTDIR="$pkgdir/" ninja install
} }

Write Preview
Loading…
Cancel
Save