From 75fc88d679c27316af54af16dfa67103fded7dd5 Mon Sep 17 00:00:00 2001 From: John Preston Date: Fri, 26 Nov 2021 18:13:58 +0400 Subject: [PATCH] Use VS 2022 with 10.0.22000.0 SDK version. --- cmake | 2 +- docs/building-win-x64.md | 12 +++++++----- docs/building-win.md | 12 +++++++----- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/cmake b/cmake index 3440748171..7332624b87 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 34407481713f987ea8b74bb949fd3d79e123e3c7 +Subproject commit 7332624b87233eee6d15d7da0e09d0287626d466 diff --git a/docs/building-win-x64.md b/docs/building-win-x64.md index 734d0aded7..7c7fa82806 100644 --- a/docs/building-win-x64.md +++ b/docs/building-win-x64.md @@ -8,9 +8,11 @@ ## Prepare folder +The build is done in **Visual Studio 2022** with **10.0.22000.0** SDK version. + Choose an empty folder for the future build, for example **D:\\TBuild**. It will be named ***BuildPath*** in the rest of this document. Create two folders there, ***BuildPath*\\ThirdParty** and ***BuildPath*\\Libraries**. -All commands (if not stated otherwise) will be launched from **x64 Native Tools Command Prompt for VS 2019.bat** (should be in **Start Menu > Visual Studio 2019** menu folder). Pay attention not to use any other Command Prompt. +All commands (if not stated otherwise) will be launched from **x64 Native Tools Command Prompt for VS 2022.bat** (should be in **Start Menu > Visual Studio 2022** menu folder). Pay attention not to use any other Command Prompt. ### Obtain your API credentials @@ -24,7 +26,7 @@ You will require **api_id** and **api_hash** to access the Telegram API servers. * Download **MSYS2** installer from [http://www.msys2.org/](http://www.msys2.org/) and install to ***BuildPath*\\ThirdParty\\msys64** * Download **jom** archive from [http://download.qt.io/official_releases/jom/jom.zip](http://download.qt.io/official_releases/jom/jom.zip) and unpack to ***BuildPath*\\ThirdParty\\jom** * Download **Python 3.9** installer from [https://www.python.org/downloads/](https://www.python.org/downloads/) and install to ***BuildPath*\\ThirdParty\\Python39** -* Download **CMake** installer from [https://cmake.org/download/](https://cmake.org/download/) and install to ***BuildPath*\\ThirdParty\\cmake** +* Download **CMake 3.21 or later** installer from [https://cmake.org/download/](https://cmake.org/download/) and install to ***BuildPath*\\ThirdParty\\cmake** * Download **Ninja** executable from [https://github.com/ninja-build/ninja/releases/download/v1.7.2/ninja-win.zip](https://github.com/ninja-build/ninja/releases/download/v1.7.2/ninja-win.zip) and unpack to ***BuildPath*\\ThirdParty\\Ninja** * Download **Git** installer from [https://git-scm.com/download/win](https://git-scm.com/download/win) and install it. * Download **NuGet** executable from [https://dist.nuget.org/win-x86-commandline/latest/nuget.exe](https://dist.nuget.org/win-x86-commandline/latest/nuget.exe) and put to ***BuildPath*\\ThirdParty\\NuGet** @@ -38,13 +40,13 @@ Add **Python 3.9** and **NuGet** to your PATH: * Add ***BuildPath*\\ThirdParty\\Python39** value. * Add ***BuildPath*\\ThirdParty\\NuGet** value. -Open **x64 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath*** and run +Open **x64 Native Tools Command Prompt for VS 2022.bat**, go to ***BuildPath*** and run python -m pip install pywin32 ## Clone source code and prepare libraries -Open **x64 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath*** and run +Open **x64 Native Tools Command Prompt for VS 2022.bat**, go to ***BuildPath*** and run git clone --recursive https://github.com/telegramdesktop/tdesktop.git tdesktop\Telegram\build\prepare\win.bat @@ -55,7 +57,7 @@ Go to ***BuildPath*\\tdesktop\\Telegram** and run (using [your **api_id** and ** configure.bat x64 -D TDESKTOP_API_ID=YOUR_API_ID -D TDESKTOP_API_HASH=YOUR_API_HASH -D DESKTOP_APP_USE_PACKAGED=OFF -D DESKTOP_APP_DISABLE_CRASH_REPORTS=OFF -* Open ***BuildPath*\\tdesktop\\out\\Telegram.sln** in Visual Studio 2019 +* Open ***BuildPath*\\tdesktop\\out\\Telegram.sln** in Visual Studio 2022 * 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**) diff --git a/docs/building-win.md b/docs/building-win.md index 0c9af5d7b8..bc7d246fc5 100644 --- a/docs/building-win.md +++ b/docs/building-win.md @@ -8,9 +8,11 @@ ## Prepare folder +The build is done in **Visual Studio 2022** with **10.0.22000.0** SDK version. + Choose an empty folder for the future build, for example **D:\\TBuild**. It will be named ***BuildPath*** in the rest of this document. Create two folders there, ***BuildPath*\\ThirdParty** and ***BuildPath*\\Libraries**. -All commands (if not stated otherwise) will be launched from **x86 Native Tools Command Prompt for VS 2019.bat** (should be in **Start Menu > Visual Studio 2019** menu folder). Pay attention not to use any other Command Prompt. +All commands (if not stated otherwise) will be launched from **x86 Native Tools Command Prompt for VS 2022.bat** (should be in **Start Menu > Visual Studio 2022** menu folder). Pay attention not to use any other Command Prompt. ### Obtain your API credentials @@ -24,7 +26,7 @@ You will require **api_id** and **api_hash** to access the Telegram API servers. * Download **MSYS2** installer from [http://www.msys2.org/](http://www.msys2.org/) and install to ***BuildPath*\\ThirdParty\\msys64** * Download **jom** archive from [http://download.qt.io/official_releases/jom/jom.zip](http://download.qt.io/official_releases/jom/jom.zip) and unpack to ***BuildPath*\\ThirdParty\\jom** * Download **Python 3.9** installer from [https://www.python.org/downloads/](https://www.python.org/downloads/) and install to ***BuildPath*\\ThirdParty\\Python39** -* Download **CMake** installer from [https://cmake.org/download/](https://cmake.org/download/) and install to ***BuildPath*\\ThirdParty\\cmake** +* Download **CMake 3.21 or later** installer from [https://cmake.org/download/](https://cmake.org/download/) and install to ***BuildPath*\\ThirdParty\\cmake** * Download **Ninja** executable from [https://github.com/ninja-build/ninja/releases/download/v1.7.2/ninja-win.zip](https://github.com/ninja-build/ninja/releases/download/v1.7.2/ninja-win.zip) and unpack to ***BuildPath*\\ThirdParty\\Ninja** * Download **Git** installer from [https://git-scm.com/download/win](https://git-scm.com/download/win) and install it. * Download **NuGet** executable from [https://dist.nuget.org/win-x86-commandline/latest/nuget.exe](https://dist.nuget.org/win-x86-commandline/latest/nuget.exe) and put to ***BuildPath*\\ThirdParty\\NuGet** @@ -38,13 +40,13 @@ Add **Python 3.9** and **NuGet** to your PATH: * Add ***BuildPath*\\ThirdParty\\Python39** value. * Add ***BuildPath*\\ThirdParty\\NuGet** value. -Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath*** and run +Open **x86 Native Tools Command Prompt for VS 2022.bat**, go to ***BuildPath*** and run python -m pip install pywin32 ## Clone source code and prepare libraries -Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath*** and run +Open **x86 Native Tools Command Prompt for VS 2022.bat**, go to ***BuildPath*** and run git clone --recursive https://github.com/telegramdesktop/tdesktop.git tdesktop\Telegram\build\prepare\win.bat @@ -55,7 +57,7 @@ Go to ***BuildPath*\\tdesktop\\Telegram** and run (using [your **api_id** and ** configure.bat -D TDESKTOP_API_ID=YOUR_API_ID -D TDESKTOP_API_HASH=YOUR_API_HASH -D DESKTOP_APP_USE_PACKAGED=OFF -D DESKTOP_APP_DISABLE_CRASH_REPORTS=OFF -* Open ***BuildPath*\\tdesktop\\out\\Telegram.sln** in Visual Studio 2019 +* Open ***BuildPath*\\tdesktop\\out\\Telegram.sln** in Visual Studio 2022 * 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**)