mirror of
https://github.com/qTox/qTox.git
synced 2024-03-22 14:00:36 +08:00
fix: simple_make.sh script
- fix crash when run without parameters - use cmake instad of automake for building toxcore
This commit is contained in:
parent
f65eb35040
commit
ead2152d6f
18
bootstrap.sh
18
bootstrap.sh
|
@ -93,23 +93,7 @@ install_toxcore() {
|
||||||
"${BASE_DIR}/${TOXCORE_DIR}"
|
"${BASE_DIR}/${TOXCORE_DIR}"
|
||||||
|
|
||||||
pushd ${BASE_DIR}/${TOXCORE_DIR}
|
pushd ${BASE_DIR}/${TOXCORE_DIR}
|
||||||
./autogen.sh
|
cmake .
|
||||||
|
|
||||||
# configure
|
|
||||||
if [[ $SYSTEM_WIDE = "false" ]]
|
|
||||||
then
|
|
||||||
./configure --prefix=${BASE_DIR}
|
|
||||||
else
|
|
||||||
./configure
|
|
||||||
fi
|
|
||||||
|
|
||||||
# ensure A/V support is enabled
|
|
||||||
if ! grep -Fxq "BUILD_AV_TRUE=''" config.log
|
|
||||||
then
|
|
||||||
echo "A/V support of libtoxcore is disabled but required by qTox. Aborting."
|
|
||||||
echo "Maybe the dev-packages of libopus and libvpx are not installed?"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# compile
|
# compile
|
||||||
make -j $(nproc)
|
make -j $(nproc)
|
||||||
|
|
|
@ -3,8 +3,8 @@
|
||||||
set -eu -o pipefail
|
set -eu -o pipefail
|
||||||
|
|
||||||
# additional flags for apt-get, used for CI
|
# additional flags for apt-get, used for CI
|
||||||
readonly APT_FLAGS=$1
|
readonly APT_FLAGS='$1'
|
||||||
readonly WITHOUT_SQLCIPHER=$2
|
readonly WITHOUT_SQLCIPHER='$2'
|
||||||
|
|
||||||
apt_install() {
|
apt_install() {
|
||||||
local apt_packages=(
|
local apt_packages=(
|
||||||
|
|
Loading…
Reference in New Issue
Block a user