2
0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-31 22:46:10 +00:00

Merge branch 'master' into dev

This commit is contained in:
John Preston
2016-10-18 00:27:16 +03:00
7 changed files with 43 additions and 81 deletions

View File

@@ -14,10 +14,6 @@ By git in Terminal go to **/Users/user/TBuild** and run:
git clone https://github.com/telegramdesktop/tdesktop.git
or:
* download in ZIP and extract to **/Users/user/TBuild**
* rename **tdesktop-master** to **tdesktop**.
###Prepare libraries
In your build Terminal run:
@@ -51,11 +47,6 @@ From https://github.com/telegramdesktop/openssl-xcode with git in Terminal:
git clone https://github.com/telegramdesktop/openssl-xcode.git
or:
* download in ZIP and extract to **/Users/user/TBuild/Libraries**,
* rename **openssl-xcode-master** to **openssl-xcode**
The path to openssl.xcodeproj should now be: **/Users/user/TBuild/Libraries/openssl-xcode/openssl.xcodeproj**
#####Get the source code:
@@ -98,12 +89,6 @@ From https://github.com/telegramdesktop/libexif-0.6.20 with git in Terminal:
git clone https://github.com/telegramdesktop/libexif-0.6.20.git
or:
* download in ZIP
* extract to **/Users/user/TBuild/Libraries**
* rename **libexif-0.6.20-master** to **libexif-0.6.20**
The folder configure should have this path:
**/Users/user/TBuild/Libraries/libexif-0.6.20/configure**