Skip to content
This repository has been archived by the owner on Feb 12, 2023. It is now read-only.

Commit

Permalink
fix: simple_make.sh script
Browse files Browse the repository at this point in the history
- fix crash when run without parameters
- use cmake instad of automake for building toxcore
  • Loading branch information
tox-user committed Jun 25, 2018
1 parent f65eb35 commit ead2152
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 19 deletions.
18 changes: 1 addition & 17 deletions bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions simple_make.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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=(
Expand Down

0 comments on commit ead2152

Please sign in to comment.