Minimal update of build instructions to use CMake.

This commit is contained in:
John Preston 2019-12-31 15:08:56 +03:00
parent 22df6fb42e
commit 3b562bfa3a
7 changed files with 17 additions and 18 deletions

View File

@ -46,7 +46,7 @@ Go to ***BuildPath*** and run
git clone https://github.com/Kitware/CMake cmake
cd cmake
git checkout v3.15.3
git checkout v3.16.0
./bootstrap
make $MAKE_THREADS_CNT
sudo make install
@ -304,7 +304,7 @@ Go to ***BuildPath*** and run
Go to ***BuildPath*/tdesktop/Telegram** and run (using [your **api_id** and **api_hash**](#obtain-your-api-credentials))
gyp/refresh.sh --api-id YOUR_API_ID --api-hash YOUR_API_HASH
./configure.sh -D TDESKTOP_API_ID=YOUR_API_ID -D TDESKTOP_API_HASH=YOUR_API_HASH -D DESKTOP_APP_USE_PACKAGED=OFF
To make Debug version go to ***BuildPath*/tdesktop/out/Debug** and run
@ -314,6 +314,6 @@ To make Release version go to ***BuildPath*/tdesktop/out/Release** and run
make $MAKE_THREADS_CNT
You can debug your builds from Qt Creator, just open **CMakeLists.txt** from ***BuildPath*/tdesktop/out/Debug** and launch with debug.
You can debug your builds from Qt Creator, just open ***BuildPath*/tdesktop/CMakeLists.txt**, configure to a separate directory with correct options and launch with debug.
[api_credentials]: api_credentials.md

View File

@ -164,16 +164,13 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
jom -j4 install
cd ..
cd ../tdesktop/Telegram
gyp\refresh.bat
## Build the project
If you want to pass a build define (like `TDESKTOP_DISABLE_AUTOUPDATE` or `TDESKTOP_DISABLE_NETWORK_PROXY`), call `set TDESKTOP_BUILD_DEFINES=TDESKTOP_DISABLE_AUTOUPDATE,TDESKTOP_DISABLE_NETWORK_PROXY,...` (comma seperated string)
Go to ***BuildPath*\\tdesktop\\Telegram** and run (using [your **api_id** and **api_hash**](#obtain-your-api-credentials))
After, call **gyp\refresh.bat** once again.
configure.bat -D TDESKTOP_API_ID=YOUR_API_ID -D TDESKTOP_API_HASH=YOUR_API_HASH -D DESKTOP_APP_USE_PACKAGED=OFF
* Open ***BuildPath*\\tdesktop\\Telegram\\Telegram.sln** in Visual Studio 2019
* Open ***BuildPath*\\tdesktop\\out\\Telegram.sln** in Visual Studio 2019
* 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**)

View File

@ -1,5 +1,7 @@
## Build instructions for Xcode 10.1
**NB** These are used for OS X 10.10/10.11 build, after the [Building using Xcode][xcode] instructions.
### Prepare folder
Choose a folder for the future build, for example **/Users/user/TBuild**. It will be named ***BuildPath*** in the rest of this document. All commands will be launched from Terminal.
@ -247,10 +249,10 @@ Go to ***BuildPath*** and run
### Building the project
Go to ***BuildPath*/tdesktop/Telegram** and run
Go to ***BuildPath*/tdesktop/Telegram** and run (using [your **api_id** and **api_hash**](#obtain-your-api-credentials))
gyp/refresh.sh
./configure.sh -D TDESKTOP_API_ID=YOUR_API_ID -D TDESKTOP_API_HASH=YOUR_API_HASH -D DESKTOP_APP_USE_PACKAGED=OFF
Then launch Xcode, open ***BuildPath*/tdesktop/Telegram/Telegram.xcodeproj** and build for Debug / Release.
Then launch Xcode, open ***BuildPath*/tdesktop/out/Telegram.xcodeproj** and build for Debug / Release.
[api_credentials]: api_credentials.md

View File

@ -1,7 +1,7 @@
Building via qmake
==================
**NB** These are outdated, please refer to [Building using GYP/CMake][cmake] instructions.
**NB** These are outdated, please refer to [Building using CMake][cmake] instructions.
The following commands assume the following environment variables are set:

View File

@ -1,6 +1,6 @@
## Build instructions for Qt Creator 3.5.1 under Ubuntu 12.04
**NB** These are outdated, please refer to [Building using GYP/CMake][cmake] instructions.
**NB** These are outdated, please refer to [Building using CMake][cmake] instructions.
### Prepare

View File

@ -1,6 +1,6 @@
## Build instructions for Xcode 10.1
**NB** These are used for OS X 10.6/10.7 build, after the [Building using Xcode][xcode] instructions.
**NB** These are outdated, please refer to [Building using Xcode][xcode] instructions.
### Download libraries

View File

@ -248,10 +248,10 @@ Go to ***BuildPath*** and run
### Building the project
Go to ***BuildPath*/tdesktop/Telegram** and run
Go to ***BuildPath*/tdesktop/Telegram** and run (using [your **api_id** and **api_hash**](#obtain-your-api-credentials))
gyp/refresh.sh
./configure.sh -D TDESKTOP_API_ID=YOUR_API_ID -D TDESKTOP_API_HASH=YOUR_API_HASH -D DESKTOP_APP_USE_PACKAGED=OFF
Then launch Xcode, open ***BuildPath*/tdesktop/Telegram/Telegram.xcodeproj** and build for Debug / Release.
Then launch Xcode, open ***BuildPath*/tdesktop/out/Telegram.xcodeproj** and build for Debug / Release.
[api_credentials]: api_credentials.md