procyberian/tdesktop
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 5

Fix build with GCC.

Browse source
This commit is contained in:
John Preston 2017-10-13 20:35:29 +03:00
parent 6445c0563e
commit e02d209e6f
4 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Telegram/SourceFiles/facades.h
View file

@ -23,10 +23,6 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
#include "base/type_traits.h"
#include "base/observer.h"
namespace Window {
class LayerWidget;
} // namespace Window
class BoxContent;
namespace InlineBots {

1
Telegram/SourceFiles/mainwindow.h
View file

@ -37,6 +37,7 @@ class ClearManager;
} // namespace Local
namespace Window {
class LayerWidget;
class LayerStackWidget;
class SectionMemento;
struct SectionShow;

2
Telegram/SourceFiles/window/window_controller.h
View file

@ -27,6 +27,8 @@ class MainWidget;
namespace Window {
class LayerWidget;
enum class GifPauseReason {
Any = 0,
InlineResults = (1 << 0),

8
docs/building-cmake.md
View file

@ -2,7 +2,7 @@
### Prepare folder
Choose an empty folder for the future build, for example **/home/user/TBuild**. It will be named ***BuildPath*** in the rest of this document. Create a ***BuildPath*/Libraries** folder there. All commands will be launched from Terminal.
Choose an empty folder for the future build, for example **/home/user/TBuild**. It will be named ***BuildPath*** in the rest of this document.
### Install software and required packages
@ -12,11 +12,13 @@ You will need GCC 7.2 and CMake 3.2 installed. To install them and all the requi
sudo add-apt-repository ppa:ubuntu-toolchain-r/test
sudo add-apt-repository ppa:george-edison55/cmake-3.x
sudo apt-get update
sudo apt-get install gcc-7 g++-7
sudo apt-get install gcc-7 g++-7 cmake
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 60
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-7 60
sudo add-apt-repository --remove ppa:ubuntu-toolchain-r/test
sudo add-apt-repository --remove ppa:george-edison55/cmake-3.x
sudo apt-get install git libexif-dev liblzma-dev libz-dev libssl-dev libappindicator-dev libunity-dev libicu-dev libdee-dev libdrm-dev dh-autoreconf autoconf automake build-essential libass-dev libfreetype6-dev libgpac-dev libsdl1.2-dev libtheora-dev libtool libva-dev libvdpau-dev libvorbis-dev libxcb1-dev libxcb-image0-dev libxcb-shm0-dev libxcb-xfixes0-dev libxcb-keysyms1-dev libxcb-icccm4-dev libxcb-render-util0-dev libxcb-util0-dev libxrender-dev libasound-dev libpulse-dev libxcb-sync0-dev libxcb-randr0-dev libx11-xcb-dev libffi-dev pkg-config texi2html zlib1g-dev yasm cmake xutils-dev bison python-xcbgen
sudo apt-get install git libexif-dev liblzma-dev libz-dev libssl-dev libappindicator-dev libunity-dev libicu-dev libdee-dev libdrm-dev dh-autoreconf autoconf automake build-essential libass-dev libfreetype6-dev libgpac-dev libsdl1.2-dev libtheora-dev libtool libva-dev libvdpau-dev libvorbis-dev libxcb1-dev libxcb-image0-dev libxcb-shm0-dev libxcb-xfixes0-dev libxcb-keysyms1-dev libxcb-icccm4-dev libxcb-render-util0-dev libxcb-util0-dev libxrender-dev libasound-dev libpulse-dev libxcb-sync0-dev libxcb-randr0-dev libx11-xcb-dev libffi-dev libncurses5-dev pkg-config texi2html zlib1g-dev yasm cmake xutils-dev bison python-xcbgen
You can set the multithreaded make parameter by running