From 4e014c300ac67acaab03dc240d040e541594f903 Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Thu, 15 Feb 2024 12:23:01 +0100 Subject: [PATCH] Update Readme --- README.md | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 1ef018654..2836eb328 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ You will need the tools : - `six` : use 'pip install six --user' - `git` -For Desktop : you will need [Qt5](https://www.qt.io/download-thank-you) (_5.12 or newer_). `C++11` support is required! +For Desktop : you will need [Qt5](https://www.qt.io/download-thank-you) (_5.15 or newer_). `C++11` support is required! ### Set your environment @@ -58,8 +58,8 @@ For Desktop : you will need [Qt5](https://www.qt.io/download-thank-you) (_5.12 o 2. You have to set the environment variable `Qt5_DIR` to point to the path containing the cmake folders of Qt5, and the `PATH` to the Qt5 `bin`. Example: - Qt5_DIR="~/Qt/5.12.5/gcc_64/lib/cmake/Qt5" - PATH="~/Qt/5.12.5/gcc_64/bin/:$PATH" + Qt5_DIR="~/Qt/5.15.2/gcc_64/lib/cmake/Qt5" + PATH="~/Qt/5.15.2/gcc_64/bin/:$PATH" Note: If you have the third party tool `qtchooser` installed : eval "$(qtchooser -print-env)" @@ -177,18 +177,14 @@ For example: ## Specific instructions for the Windows platform -64-bit version is not fully supported at this moment by Linphone Desktop and wasn't tested. -If a build for 64bits is needed, replace all `mingw32` by `mingw64`, `i686` by `x86_64`, `-A Win32` by `-A x64` or simply remove it. - 1. Install main tools: - `MinGW/MSYS2` : [download](https://www.msys2.org/) - Follow instructions on their "Getting Started" page. - Install toolchains and prepare python: - - `pacman -Sy --needed base-devel mingw-w64-i686-toolchain` + - `pacman -Sy --needed base-devel mingw-w64-x86_64-toolchain` - `pacman -S python3-pip` in `MSYS2 MSYS` console - `python3 -m pip install pystache six` in `cmd` - - In this order, add `C:\msys64\mingw\bin`, `C:\msys64\` and `C:\msys64\usr\bin` in your PATH environement variable from Windows advanced settings. Binaries from the msys folder (not from mingw32/64) doesn't fully support Windows Path and thus, they are to be avoided. -* is the version of MinGW32/64* + - In this order, add `C:\msys64\mingw64\bin`, `C:\msys64\` and `C:\msys64\usr\bin` in your PATH environement variable from Windows advanced settings. Binaries from the msys folder (not from mingw32/64) doesn't fully support Windows Path and thus, they are to be avoided. When building the SDK, it will install automatically from MSYS2 : `toolchain`, `python`, `doxygen`, `perl`, `yasm`, `gawk`, `bzip2`, `nasm`, `sed`, `patch`, `pkg-config`, `gettext`, `glib2`, `intltool` and `graphviz` (if needed) @@ -196,15 +192,13 @@ When building the SDK, it will install automatically from MSYS2 : `toolchain`, ` - Visual Studio must also be properly configured with addons. Under "Tools"->"Obtain tools and features", make sure that the following components are installed: - Tasks: Select Windows Universal Platform development, Desktop C++ Development, .NET Development - - Under "Installation details". Go to "Desktop C++ Development" and add "SDK Windows 8.1 and SDK UCRT" - - Individual component: Windows 8.1 SDK -2. Ensure that you have downloaded the `Qt msvc2015 version` or `Qt msvc2017 version` (32-bit). +2. Ensure that you have downloaded the `Qt msvc2019 version` (64-bit). Note that `Qt msvc2019` can be use with earlier version of Visual Studio. -3. Or open a Command line with Visual Studio `Developer Command Prompt for VS 2017` and call qtenv2.bat that is in your qt binaries eg: `C:\Qt\\msvc2017\bin\qtenv2.bat` +3. Or open a Command line with Visual Studio `Developer Command Prompt for VS 2019` and call qtenv2.bat that is in your qt binaries eg: `C:\Qt\\msvc2019\bin\qtenv2.bat` -4. Build as usual with adding `-A Win32` to `cmake ..` (General Steps) : - - `cmake .. -DCMAKE_BUILD_PARALLEL_LEVEL=10 -DCMAKE_BUILD_TYPE=RelWithDebInfo -A Win32` +4. Build as usual with adding `-A x64` to `cmake ..` (General Steps) : + - `cmake .. -DCMAKE_BUILD_PARALLEL_LEVEL=10 -DCMAKE_BUILD_TYPE=RelWithDebInfo -A x64` The default build is very long. It is prefered to use the Ninja generator `-G "Ninja"` - `cmake --build . --target ALL_BUILD --parallel 10 --config RelWithDebInfo`