minecraft-pi-reborn
/
minecraft-pi-reborn
7
11
Fork 13
Code Issues 5 Pull Requests 2 Actions Releases 3 Activity

Use Ninja

This commit is contained in:
TheBrokenRail 2022-03-06 20:13:41 -05:00
parent 0fd562af40
commit e9e9b90bdb
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/build.sh
View File

@ -17,14 +17,14 @@ build() {
# Build ARM Components # Build ARM Components
cd arm cd arm
make -j$(nproc) cmake --build .
make install DESTDIR="${prefix}" DESTDIR="${prefix}" cmake --install .
cd ../ cd ../
# Build Native Components # Build Native Components
cd native cd native
make -j$(nproc) cmake --build .
make install DESTDIR="${prefix}" DESTDIR="${prefix}" cmake --install .
cd ../ cd ../
# Exit # Exit
@ -45,8 +45,8 @@ armhf_build() {
mkdir -p "${prefix}" mkdir -p "${prefix}"
# Build All Components # Build All Components
make -j$(nproc) cmake --build .
make install DESTDIR="${prefix}" DESTDIR="${prefix}" cmake --install .
# Exit # Exit
cd ../../ cd ../../

2
scripts/install-dependencies.sh
View File

@ -25,7 +25,7 @@ sudo apt-get install --no-install-recommends -y \
dpkg-dev \ dpkg-dev \
git \ git \
cmake \ cmake \
make \ ninja-build \
libglfw3 libglfw3-dev \ libglfw3 libglfw3-dev \
libfreeimage3 libfreeimage-dev \ libfreeimage3 libfreeimage-dev \
crossbuild-essential-armhf \ crossbuild-essential-armhf \

6
scripts/setup.sh
View File

@ -28,13 +28,13 @@ setup() {
# Build ARM Components # Build ARM Components
mkdir arm mkdir arm
cd 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 ../ cd ../
# Build Native Components # Build Native Components
mkdir native mkdir native
cd 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 ../ cd ../
# Exit # Exit
@ -55,7 +55,7 @@ armhf_setup() {
fi fi
# Build All Components # 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 # Exit
cd ../../ cd ../../