diff --git a/mingw-w64-globjects/PKGBUILD b/mingw-w64-globjects/PKGBUILD
index b825db377b..a46d414017 100644
--- a/mingw-w64-globjects/PKGBUILD
+++ b/mingw-w64-globjects/PKGBUILD
@@ -6,7 +6,7 @@ pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.1.0
 pkgrel=1
 arch=('any')
-mingw_arch=('mingw32' 'mingw64')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64')
 url='https://github.com/cginternals/globjects'
 pkgdesc="Cross-platform C++ wrapper for OpenGL API objects. (mingw-w64)"
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
@@ -14,10 +14,10 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-glm")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
+             "${MINGW_PACKAGE_PREFIX}-ninja"
              "${MINGW_PACKAGE_PREFIX}-doxygen")
 license=('MIT')
 options=('strip' 'staticlibs' 'docs')
-
 source=(${_realname}-${pkgver}.tar.gz::"https://github.com/cginternals/globjects/archive/v${pkgver}.tar.gz"
         'mingw-unix-layout.patch'
         'config-export-location.patch')
@@ -41,27 +41,26 @@ build() {
   fi
 
   # Build shared libs
-  [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
-  mkdir -p ${srcdir}/build-${MINGW_CHOST}
-  cd ${srcdir}/build-${MINGW_CHOST}
+  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
+  mkdir -p ${srcdir}/build-${MSYSTEM}
+  cd ${srcdir}/build-${MSYSTEM}
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake \
-    -G"MSYS Makefiles" \
+    -G"Ninja" \
     -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
     -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
-    -DCMAKE_C_COMPILER=${MINGW_CHOST}-gcc \
-    -DCMAKE_CXX_COMPILER=${MINGW_CHOST}-g++ \
     -DOPTION_BUILD_EXAMPLES=OFF \
     -DOPTION_BUILD_TESTS=OFF \
     -DSYSTEM_DIR_INSTALL=ON \
     -DBUILD_SHARED_LIBS=ON \
     -DOPTION_BUILD_DOCS=ON \
     ../${_realname}-${pkgver}
-  make
+
+  ${MINGW_PREFIX}/bin/cmake --build .
 }
 
 package () {
-  cd "${srcdir}/build-${MINGW_CHOST}"
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}/build-${MSYSTEM}"
+  DESTDIR=${pkgdir} ${MINGW_PREFIX}/bin/cmake --install .
 }