diff --git a/mingw-w64-raylib/PKGBUILD b/mingw-w64-raylib/PKGBUILD index 330db198fd..56ae4f8cbc 100644 --- a/mingw-w64-raylib/PKGBUILD +++ b/mingw-w64-raylib/PKGBUILD @@ -4,7 +4,7 @@ _realname=raylib pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") pkgver=4.5.0 -pkgrel=1 +pkgrel=2 pkgdesc='Simple and easy-to-use game programming library (mingw-w64)' arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') @@ -18,9 +18,6 @@ source=("${_realname}-${pkgver}.tar.gz::https://github.com/raysan5/raylib/archiv sha256sums=('0df98bfc553db31356cab46a2f9ed6d932065f186a0fff24bafa05f8a60e16d1') build() { - cd "${srcdir}/${_realname}-${pkgver}" - mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}" - declare -a extra_config if check_option "debug" "n"; then extra_config+=("-DCMAKE_BUILD_TYPE=Release") @@ -34,16 +31,28 @@ build() { -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ "${extra_config[@]}" \ -DBUILD_EXAMPLES=OFF \ - -DBUILD_SHARED_LIBS=ON \ - ../${_realname}-${pkgver} + -DBUILD_SHARED_LIBS=OFF \ + -B "build-${MSYSTEM}-static" \ + -S "${_realname}-${pkgver}" - "${MINGW_PREFIX}"/bin/cmake.exe --build . + "${MINGW_PREFIX}"/bin/cmake.exe --build "build-${MSYSTEM}-static" + + MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ + ${MINGW_PREFIX}/bin/cmake.exe \ + -G"Ninja" \ + -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ + "${extra_config[@]}" \ + -DBUILD_EXAMPLES=OFF \ + -DBUILD_SHARED_LIBS=ON \ + -B "build-${MSYSTEM}-shared" \ + -S "${_realname}-${pkgver}" + + "${MINGW_PREFIX}"/bin/cmake.exe --build "build-${MSYSTEM}-shared" } package() { - cd "${srcdir}/build-${MSYSTEM}" - - DESTDIR="${pkgdir}" "${MINGW_PREFIX}"/bin/cmake.exe --install . + DESTDIR="${pkgdir}" "${MINGW_PREFIX}"/bin/cmake.exe --install "build-${MSYSTEM}-static" + DESTDIR="${pkgdir}" "${MINGW_PREFIX}"/bin/cmake.exe --install "build-${MSYSTEM}-shared" install -Dm644 "${srcdir}/${_realname}-${pkgver}/LICENSE" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE" }