1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00

fix os x compiling, update dependencies

This commit is contained in:
Dubslow 2014-12-01 16:51:53 -06:00
parent 4781c8cfbb
commit aae9233dc1
No known key found for this signature in database
GPG Key ID: 3DB8E05315C220AA
3 changed files with 8 additions and 8 deletions

View File

@ -115,23 +115,23 @@ The following steps assumes that you cloned the repository at "/home/user/qTox".
Debian:
```bash
sudo apt-get install build-essential qt5-qmake qt5-default libopenal-dev libopencv-dev
sudo apt-get install build-essential qt5-qmake qt5-default libopenal-dev libopencv-dev libxss-dev
```
Ubuntu:
```bash
sudo apt-get install build-essential qt5-qmake qt5-default qttools5-dev-tools libopenal-dev libopencv-dev
sudo apt-get install build-essential qt5-qmake qt5-default qttools5-dev-tools libopenal-dev libopencv-dev libxss-dev
```
Arch Linux:
```bash
sudo pacman -S --needed base-devel qt5 opencv openal
sudo pacman -S --needed base-devel qt5 opencv openal libxss
```
Fedora:
```bash
yum groupinstall "Development Tools"
yum install qt-devel qt-doc qt-creator opencv-devel openal-soft-devel
yum install qt-devel qt-doc qt-creator opencv-devel openal-soft-devel libXScrnSaver-devel
```
###Tox Core

View File

@ -2,12 +2,12 @@
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 qttools5-dev-tools qtchooser
libtool autotools-dev automake checkinstall check libopus-dev libvpx-dev qttools5-dev-tools qtchooser libxss-dev
elif which pacman; then
sudo pacman -S --needed base-devel qt5 opencv openal opus libvpx
sudo pacman -S --needed base-devel qt5 opencv openal opus libvpx libxss
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
yum install qt-devel qt-doc qt-creator opencv-devel openal-soft-devel libtool autoconf automake check check-devel libXScrnSaver-devel
else
echo "Unknown package manager, attempting to compile anyways"
fi

View File

@ -15,7 +15,7 @@
*/
#include <QDebug>
#ifdef Q_OS_UNIX
#if defined(Q_OS_UNIX) && !defined(__APPLE__) && !defined(__MACH__)
#include "src/platform/timer.h"
#include <X11/extensions/scrnsaver.h>