StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'pr1920'

Browse Source
This commit is contained in:
tux3 2015-06-27 21:16:11 +02:00
commit b88eacb037
No known key found for this signature in database
GPG Key ID: 7E086DD661263264
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
INSTALL.md
View File

@ -76,12 +76,12 @@ sudo pacman -S --needed base-devel qt5 openal libxss qrencode ffmpeg
Debian <10 / Ubuntu <15.04: Debian <10 / Ubuntu <15.04:
**Note that ffmpeg is not included in those distribution version(!).** **Note that ffmpeg is not included in those distribution version(!).**
```bash ```bash
sudo apt-get install build-essential qt5-qmake qt5-default qttools5-dev-tools libqt5opengl5-dev libqt5svg5-dev libopenal-dev libxss-dev qrencode libqrencode-dev sudo apt-get install build-essential qt5-qmake qt5-default qttools5-dev-tools libqt5opengl5-dev libqt5svg5-dev libopenal-dev libxss-dev qrencode libqrencode-dev libglib2.0-dev libgdk-pixbuf2.0-dev libgtk2.0-dev
``` ```
Debian >=10 / Ubuntu >=15.04: Debian >=10 / Ubuntu >=15.04:
```bash ```bash
sudo apt-get install build-essential qt5-qmake qt5-default qttools5-dev-tools libqt5opengl5-dev libqt5svg5-dev libopenal-dev libxss-dev qrencode libqrencode-dev libavutil-ffmpeg-dev libswresample-ffmpeg-dev libavcodec-ffmpeg-dev libswscale-ffmpeg-dev libavfilter-ffmpeg-dev libavdevice-ffmpeg-dev sudo apt-get install build-essential qt5-qmake qt5-default qttools5-dev-tools libqt5opengl5-dev libqt5svg5-dev libopenal-dev libxss-dev qrencode libqrencode-dev libavutil-ffmpeg-dev libswresample-ffmpeg-dev libavcodec-ffmpeg-dev libswscale-ffmpeg-dev libavfilter-ffmpeg-dev libavdevice-ffmpeg-dev libglib2.0-dev libgdk-pixbuf2.0-dev libgtk2.0-dev
``` ```

3
simple_make.sh
View File

@ -5,7 +5,8 @@ if which apt-get; then
git build-essential qt5-qmake qt5-default qttools5-dev-tools \ git build-essential qt5-qmake qt5-default qttools5-dev-tools \
libqt5opengl5-dev libqt5svg5-dev libopenal-dev libopencv-dev \ libqt5opengl5-dev libqt5svg5-dev libopenal-dev libopencv-dev \
libxss-dev qrencode libqrencode-dev libtool autotools-dev \ libxss-dev qrencode libqrencode-dev libtool autotools-dev \
automake checkinstall check libopus-dev libvpx-dev libsodium-dev automake checkinstall check libopus-dev libvpx-dev libsodium-dev \
libglib2.0-dev libgdk-pixbuf2.0-dev libgtk2.0-dev
elif which pacman; then elif which pacman; then
sudo pacman -S --needed \ sudo pacman -S --needed \
git base-devel qt5 opencv openal libxss qrencode opus libvpx \ git base-devel qt5 opencv openal libxss qrencode opus libvpx \