Skip to content

Commit

Permalink
Build docs updated, .sln files added to .gitignore.
Browse files Browse the repository at this point in the history
  • Loading branch information
john-preston committed Aug 14, 2016
1 parent 42ebe60 commit 4def7f2
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 3 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
/Telegram/Resources/art/sprite_150x.png
/Telegram/*.user
*.vcxproj*
*.sln
*.suo
*.sdf
*.opensdf
Expand Down
3 changes: 2 additions & 1 deletion Telegram/gyp/utils.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
'variables': {
'libs_loc': '../../../Libraries',
'src_loc': '../SourceFiles',
'res_loc': '../Resources',
},
'includes': [
'common_executable.gypi',
Expand All @@ -38,7 +39,7 @@
'<(src_loc)/_other/updater_osx.m',
],
'conditions': [
[ '<(build_win)', {
[ 'build_win', {
'sources': [
'<(res_loc)/winrc/Updater.rc',
],
Expand Down
26 changes: 24 additions & 2 deletions doc/building-msvc.md
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,6 @@ and run
..\depot_tools\gclient sync
xcopy src\src\* src /s /i


#### Build

* Open in VS2015 **D:\TBuild\Libraries\breakpad\src\client\windows\breakpad_client.sln**
Expand All @@ -255,10 +254,33 @@ and run

## Building Telegram Desktop

#### Setup GYP/Ninja and generate VS solution

* Download [Ninja binaries](https://github.com/ninja-build/ninja/releases/download/v1.7.1/ninja-win.zip) and unpack them to **D:\\TBuild\\Libraries\\ninja** to have **D:\\TBuild\\Libraries\\ninja\\ninja.exe**
* Open **VS2015 x86 Native Tools Command Prompt.bat** (should be in **Start Menu > Programs > Visual Studio 2015** menu folder)

There go to Libraries directory

D:
cd TBuild\Libraries

and run

git clone https://chromium.googlesource.com/external/gyp
SET PATH=%PATH%;D:\TBuild\Libraries\gyp;D:\TBuild\Libraries\ninja;
cd ..\tdesktop\Telegram
gyp\refresh.bat

#### Configure VS

* Launch VS2015 for configuring Qt5Package
* QT5 > Qt Options > Add
* Version name: **Qt 5.6.0 Win32**
* Path: **D:\TBuild\Libraries\qt5_6_0\qtbase**
* Default Qt/Win version: **Qt 5.6.0 Win32****OK** - You may need to restart Visual Studio for this to take effect.

#### Build the project

* File > Open > Project/Solution > **D:\TBuild\tdesktop\Telegram.sln**
* Build \ Build Solution (Debug and Release configurations)
* Select Telegram project and press Build > Build Telegram (Debug and Release configurations)
* The result Telegram.exe will be located in **D:\TBuild\tdesktop\out\Debug** (and **Release**)

0 comments on commit 4def7f2

Please sign in to comment.