diff --git a/INSTALL.md b/INSTALL.md index f53adbeb4..b5b2d5f11 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -131,17 +131,17 @@ First of all install the dependencies of Tox Core. Debian: ```bash -sudo apt-get install libtool autotools-dev automake checkinstall check yasm libopus-dev libvpx-dev +sudo apt-get install libtool autotools-dev automake checkinstall check libopus-dev libvpx-dev ``` Ubuntu: ```bash -sudo apt-get install libtool autotools-dev automake checkinstall check yasm libopus-dev libvpx-dev +sudo apt-get install libtool autotools-dev automake checkinstall check libopus-dev libvpx-dev ``` Arch Linux: (Arch Linux provides the package "tox-git" in AUR) ```bash -sudo pacman -S --needed yasm opus vpx +sudo pacman -S --needed opus vpx ``` Fedora: diff --git a/bootstrap.sh b/bootstrap.sh index e2b6c08c4..3d9d56003 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -21,7 +21,7 @@ TOX_CORE_DIR=libtoxcore-latest # the default value is 'false' and will be set to 'true' # if this script gets the parameter -t or --tox TOX_ONLY=false -GLOBAL=false +GLOBAL=true KEEP=false if [ -z "$BASE_DIR" ]; then diff --git a/simple_make.sh b/simple_make.sh new file mode 100755 index 000000000..cf2b0234c --- /dev/null +++ b/simple_make.sh @@ -0,0 +1,17 @@ +#! /bin/bash + +if which apt-get; then + sudo apt-get install build-essential qt5-qmake qt5-default libopenal-dev libopencv-dev \ + libtool autotools-dev automake checkinstall check libopus-dev libvpx-dev +elif which pacman; then + sudo pacman -S --needed base-devel qt5 opencv openal opus vpx +elif which yum; then + yum groupinstall "Development Tools" + yum install qt-devel qt-doc qt-creator opencv-devel openal-soft-devel libtool autoconf automake check check-devel +else + echo "Unknown package manager, attempting to compile anyways" +fi + +./bootstrap.sh +qmake +make