use nproc cores for compilation, enable jack2 again

This commit is contained in:
Volker Fischer 2019-09-21 17:57:41 +02:00
parent 0771165464
commit 12de5cd257

View file

@ -2,6 +2,7 @@
# This script is intended to setup a clean Raspberry Pi system for running Jamulus # This script is intended to setup a clean Raspberry Pi system for running Jamulus
OPUS="opus-1.1" OPUS="opus-1.1"
NCORES=$(nproc)
echo "TODO: sudo apt-get install [needed libraries for compilation and runtime]" echo "TODO: sudo apt-get install [needed libraries for compilation and runtime]"
@ -14,26 +15,26 @@ else
rm ${OPUS}.tar.gz rm ${OPUS}.tar.gz
cd ${OPUS} cd ${OPUS}
./configure --enable-custom-modes --enable-fixed-point ./configure --enable-custom-modes --enable-fixed-point
make make -j${NCORES}
cd .. cd ..
fi fi
## Jack audio without DBUS support # Jack audio without DBUS support
#if [ -d "jack2" ]; then if [ -d "jack2" ]; then
# echo "The Jack2 directory is present, we assume it is compiled and ready to use. If not, delete the jack2 directory and call this script again." echo "The Jack2 directory is present, we assume it is compiled and ready to use. If not, delete the jack2 directory and call this script again."
#else else
# git clone https://github.com/jackaudio/jack2.git git clone https://github.com/jackaudio/jack2.git
# cd jack2 cd jack2
# git checkout v1.9.12 git checkout v1.9.12
# ./waf configure --alsa --prefix=/usr/local --libdir=/usr/lib/x86_64-linux-gnu ./waf configure --alsa --prefix=/usr/local --libdir=/usr/lib/x86_64-linux-gnu
# ./waf ./waf -j${NCORES}
# cd .. cd ..
#fi fi
# compile Jamulus with external Opus library # compile Jamulus with external Opus library
cd .. cd ..
qmake "CONFIG+=opus_shared_lib" Jamulus.pro qmake "CONFIG+=opus_shared_lib" Jamulus.pro
make make -j${NCORES}
cd distributions cd distributions
# get first USB audio sound card device # get first USB audio sound card device