1
0
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:
tox-user 2018-06-25 20:09:41 +00:00
parent f65eb35040
commit ead2152d6f
No known key found for this signature in database
GPG Key ID: 7C132143C1A3A7D4
2 changed files with 3 additions and 19 deletions

View File

@ -93,23 +93,7 @@ install_toxcore() {
"${BASE_DIR}/${TOXCORE_DIR}"
pushd ${BASE_DIR}/${TOXCORE_DIR}
./autogen.sh
# 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
cmake .
# compile
make -j $(nproc)

View File

@ -3,8 +3,8 @@
set -eu -o pipefail
# additional flags for apt-get, used for CI
readonly APT_FLAGS=$1
readonly WITHOUT_SQLCIPHER=$2
readonly APT_FLAGS='$1'
readonly WITHOUT_SQLCIPHER='$2'
apt_install() {
local apt_packages=(