Use cmake to manage build directory

2 files changed, 21 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 669cc6b58ac8..dbc7ee820d4e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,12 @@
 pkgbase = mingw-w64-libsquish-fixed-tables
 	pkgdesc = DXT compression library with Rich Geldreich's fixed solid color lookup tables (mingw-w64)
 	pkgver = 1.15
-	pkgrel = 1
-	url = http://sourceforge.net/projects/libsquish
+	pkgrel = 2
+	url = https://sourceforge.net/projects/libsquish
 	arch = any
 	license = MIT
 	makedepends = mingw-w64-cmake
+	makedepends = ninja
 	depends = mingw-w64-libpng
 	provides = mingw-w64-libsquish
 	conflicts = mingw-w64-libsquish
@@ -22,4 +23,3 @@ pkgbase = mingw-w64-libsquish-fixed-tables
 	sha256sums = f489515ba5ba8aed12876becdc82201041bb54b5be0b05dbd3c0b9e907290cfc
 
 pkgname = mingw-w64-libsquish-fixed-tables
-
diff --git a/PKGBUILD b/PKGBUILD
index 3f51b16c83ea..5ac2023c12b1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,12 +1,12 @@
 # Maintainer: Vaporeon <vaporeon@vaporeon.io>
 pkgname=mingw-w64-libsquish-fixed-tables
 pkgver=1.15
-pkgrel=1
+pkgrel=2
 pkgdesc="DXT compression library with Rich Geldreich's fixed solid color lookup tables (mingw-w64)"
 arch=(any)
-url="http://sourceforge.net/projects/libsquish"
+url="https://sourceforge.net/projects/libsquish"
 license=("MIT")
-makedepends=(mingw-w64-cmake)
+makedepends=('mingw-w64-cmake' 'ninja')
 depends=(mingw-w64-libpng)
 provides=('mingw-w64-libsquish')
 conflicts=('mingw-w64-libsquish')
@@ -23,30 +23,30 @@ sha256sums=('628796eeba608866183a61d080d46967c9dda6723bc0a3ec52324c85d2147269'
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 prepare() {
-    patch -Np0 -i "${srcdir}/gcc440.patch"
-    patch -Np1 -i "${srcdir}/0001-fix-install.patch"
-    patch -Np1 -i "${srcdir}/fixed_solid_color_lookup_tables.patch"
+    patch -Np0 -i "${srcdir}"/gcc440.patch
+    patch -Np1 -i "${srcdir}"/0001-fix-install.patch
+    patch -Np1 -i "${srcdir}"/fixed_solid_color_lookup_tables.patch
 }
 
 build() {
     for _arch in ${_architectures}; do
-        mkdir -p build-${_arch}-static && pushd build-${_arch}-static
-        ${_arch}-cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF ..
-        make
-        popd
-        mkdir -p build-${_arch}-shared && pushd build-${_arch}-shared
-        ${_arch}-cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_SQUISH_EXTRA=ON ..
-        make
-        popd
+        ${_arch}-cmake -S "${srcdir}" -B build/${_arch}-static -G Ninja \
+            -DCMAKE_BUILD_TYPE=Release \
+            -DBUILD_SHARED_LIBS=OFF
+
+        ${_arch}-cmake -S "${srcdir}" -B build/${_arch} -G Ninja \
+            -DCMAKE_BUILD_TYPE=Release \
+            -DBUILD_SQUISH_EXTRA=ON
+
+        cmake --build build/${_arch}-static
+        cmake --build build/${_arch}
     done
 }
 
 package() {
     for _arch in ${_architectures}; do
-        cd "${srcdir}/build-${_arch}-static"
-        make DESTDIR="$pkgdir" install
-        cd "${srcdir}/build-${_arch}-shared"
-        make DESTDIR="$pkgdir" install
+        DESTDIR="${pkgdir}" cmake --install build/${_arch}-static
+        DESTDIR="${pkgdir}" cmake --install build/${_arch}
         rm "${pkgdir}"/usr/${_arch}/bin/*.exe
         ${_arch}-strip --strip-unneeded "${pkgdir}/usr/${_arch}/bin/"*.dll
         ${_arch}-strip -g "${pkgdir}/usr/${_arch}/lib/"*.a