From fd5eec230ef36d3bf889dfcac5129dedc2f7924a Mon Sep 17 00:00:00 2001 From: Duke Date: Sun, 14 Jan 2024 09:19:39 -0500 Subject: [PATCH] Allow custom number of cores to compile via build.sh #137 --- README.md | 3 +++ build.sh | 15 +++------------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 09df59e..f7deafc 100644 --- a/README.md +++ b/README.md @@ -66,7 +66,10 @@ Compiling can take some time, so be patient and wait for it to finish. It will t git clone https://git.hush.is/hush/SilentDragonLite cd SilentDragonLite ./build.sh linguist +# This defaults to using 2 cores to compile ./build.sh +# To use a custom number of cores to compile, such as 8 : +# ./build.sh -j8 ./SilentDragonLite ``` diff --git a/build.sh b/build.sh index 4624f74..af3dc3b 100755 --- a/build.sh +++ b/build.sh @@ -4,16 +4,6 @@ UNAME=$(uname) -if [ "$UNAME" == "Linux" ] ; then - JOBS=2 -elif [ "$UNAME" == "FreeBSD" ] ; then - JOBS=$(nproc) -elif [ "$UNAME" == "Darwin" ] ; then - JOBS=$(sysctl -n hw.ncpu) -else - JOBS=1 -fi - # check if rustc and cargo are installed, otherwise exit with error if ! command -v rustc &> /dev/null then @@ -40,7 +30,7 @@ then fi VERSION=$(cat src/version.h |cut -d\" -f2) -echo "Compiling SilentDragonLite $VERSION with $JOBS threads..." +echo "Compiling SilentDragonLite $VERSION on $UNAME with args=$@" CONF=silentdragon-lite.pro set -e @@ -48,7 +38,8 @@ qbuild () { qmake $CONF CONFIG+=debug #lupdate $CONF #lrelease $CONF - make -j$JOBS + # default to 2 jobs or use the -j value given as argument to this script + make -j2 "$@" } if [ "$1" == "clean" ]; then