From e9e9b90bdbe20e5c9d3d86dc5ec0e7adc48415ed Mon Sep 17 00:00:00 2001
From: TheBrokenRail <connor24nolan@live.com>
Date: Sun, 6 Mar 2022 20:13:41 -0500
Subject: [PATCH] Use Ninja

---
 scripts/build.sh                | 12 ++++++------
 scripts/install-dependencies.sh |  2 +-
 scripts/setup.sh                |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/scripts/build.sh b/scripts/build.sh
index 4e32e09..65855ab 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -17,14 +17,14 @@ build() {
 
     # Build ARM Components
     cd arm
-    make -j$(nproc)
-    make install DESTDIR="${prefix}"
+    cmake --build .
+    DESTDIR="${prefix}" cmake --install .
     cd ../
 
     # Build Native Components
     cd native
-    make -j$(nproc)
-    make install DESTDIR="${prefix}"
+    cmake --build .
+    DESTDIR="${prefix}" cmake --install .
     cd ../
 
     # Exit
@@ -45,8 +45,8 @@ armhf_build() {
     mkdir -p "${prefix}"
 
     # Build All Components
-    make -j$(nproc)
-    make install DESTDIR="${prefix}"
+    cmake --build .
+    DESTDIR="${prefix}" cmake --install .
 
     # Exit
     cd ../../
diff --git a/scripts/install-dependencies.sh b/scripts/install-dependencies.sh
index 01392f1..2a334a4 100755
--- a/scripts/install-dependencies.sh
+++ b/scripts/install-dependencies.sh
@@ -25,7 +25,7 @@ sudo apt-get install --no-install-recommends -y \
     dpkg-dev \
     git \
     cmake \
-    make \
+    ninja-build \
     libglfw3 libglfw3-dev \
     libfreeimage3 libfreeimage-dev \
     crossbuild-essential-armhf \
diff --git a/scripts/setup.sh b/scripts/setup.sh
index 6b7f5b2..c29d343 100755
--- a/scripts/setup.sh
+++ b/scripts/setup.sh
@@ -28,13 +28,13 @@ setup() {
     # Build ARM Components
     mkdir arm
     cd arm
-    cmake -DCMAKE_TOOLCHAIN_FILE="${ARM_TOOLCHAIN_FILE}" -DMCPI_BUILD_MODE=arm "${extra_arg}" "$@" ../../..
+    cmake -G Ninja -DCMAKE_TOOLCHAIN_FILE="${ARM_TOOLCHAIN_FILE}" -DMCPI_BUILD_MODE=arm "${extra_arg}" "$@" ../../..
     cd ../
 
     # Build Native Components
     mkdir native
     cd native
-    cmake -DCMAKE_TOOLCHAIN_FILE="${toolchain_file}" -DMCPI_BUILD_MODE=native "${extra_arg}" "$@" ../../..
+    cmake -G Ninja -DCMAKE_TOOLCHAIN_FILE="${toolchain_file}" -DMCPI_BUILD_MODE=native "${extra_arg}" "$@" ../../..
     cd ../
 
     # Exit
@@ -55,7 +55,7 @@ armhf_setup() {
     fi
 
     # Build All Components
-    cmake -DCMAKE_TOOLCHAIN_FILE="${ARM_TOOLCHAIN_FILE}" -DMCPI_BUILD_MODE=both -DMCPI_SERVER_MODE="${server_mode}" "$@" ../..
+    cmake -G Ninja -DCMAKE_TOOLCHAIN_FILE="${ARM_TOOLCHAIN_FILE}" -DMCPI_BUILD_MODE=both -DMCPI_SERVER_MODE="${server_mode}" "$@" ../..
 
     # Exit
     cd ../../