pimhwang
/
qTox
mirror of https://github.com/qTox/qTox.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

fix os x compiling, update dependencies

pull/887/head
Dubslow 11 years ago
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
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      INSTALL.md
  2. 6
      simple_make.sh
  3. 2
      src/platform/timer_x11.cpp

8
INSTALL.md
Unescape View File

@ -115,23 +115,23 @@ The following steps assumes that you cloned the repository at "/home/user/qTox".
Debian: Debian:
```bash ```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: Ubuntu:
```bash ```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: Arch Linux:
```bash ```bash
sudo pacman -S --needed base-devel qt5 opencv openal sudo pacman -S --needed base-devel qt5 opencv openal libxss
``` ```
Fedora: Fedora:
```bash ```bash
yum groupinstall "Development Tools" 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 ###Tox Core

6
simple_make.sh
Unescape View File

@ -2,12 +2,12 @@
if which apt-get; then if which apt-get; then
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 \
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 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 elif which yum; then
yum groupinstall "Development Tools" 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 else
echo "Unknown package manager, attempting to compile anyways" echo "Unknown package manager, attempting to compile anyways"
fi fi

2
src/platform/timer_x11.cpp
Unescape View File

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

Write Preview
Loading…
Cancel
Save