Update build instuctions for MSVC 2019 + 32-bit + new CMake.
GitOrigin-RevId: 4860583c1fc22ef9f40cdcf602fd8e49410254e5
This commit is contained in:
parent
6cbc02ed1b
commit
1ea7510500
@ -118,7 +118,7 @@ cd <path to vcpkg>
|
|||||||
cmake -DCMAKE_TOOLCHAIN_FILE=<path to vcpkg>\scripts\buildsystems\vcpkg.cmake ..
|
cmake -DCMAKE_TOOLCHAIN_FILE=<path to vcpkg>\scripts\buildsystems\vcpkg.cmake ..
|
||||||
```
|
```
|
||||||
|
|
||||||
To build 64-bit `TDLib` using MSVC, you will need to additionally specify parameter `-A x64` to CMake.
|
To build 32-bit/64-bit `TDLib` using MSVC, you will need to additionally specify parameter `-A Win32`/`-A x64` to CMake.
|
||||||
To build `TDLib` in Release mode using MSVC, you will need to additionally specify parameter `--config Release` to the `cmake --build .` command.
|
To build `TDLib` in Release mode using MSVC, you will need to additionally specify parameter `--config Release` to the `cmake --build .` command.
|
||||||
|
|
||||||
<a name="linux"></a>
|
<a name="linux"></a>
|
||||||
|
@ -682,8 +682,12 @@ function onOptionsChanged() {
|
|||||||
if (!use_msvc) {
|
if (!use_msvc) {
|
||||||
options.push('-DCMAKE_BUILD_TYPE=' + (is_debug_build ? 'Debug' : 'Release'));
|
options.push('-DCMAKE_BUILD_TYPE=' + (is_debug_build ? 'Debug' : 'Release'));
|
||||||
}
|
}
|
||||||
if (build_64bit && use_msvc) {
|
if (use_msvc) {
|
||||||
options.push('-A x64');
|
if (build_64bit) {
|
||||||
|
options.push('-A x64');
|
||||||
|
} else {
|
||||||
|
options.push('-A Win32');
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return options;
|
return options;
|
||||||
}
|
}
|
||||||
|
@ -11,7 +11,7 @@ cd jnibuild
|
|||||||
cmake -DCMAKE_BUILD_TYPE=Release -DTD_ENABLE_JNI=ON -DCMAKE_INSTALL_PREFIX:PATH=../example/java/td ..
|
cmake -DCMAKE_BUILD_TYPE=Release -DTD_ENABLE_JNI=ON -DCMAKE_INSTALL_PREFIX:PATH=../example/java/td ..
|
||||||
cmake --build . --target install
|
cmake --build . --target install
|
||||||
```
|
```
|
||||||
If you want to compile TDLib for 64-bit Java on Windows using MSVC, you will also need to add `-A x64` option to CMake.
|
If you want to compile TDLib for 32-bit/64-bit Java on Windows using MSVC, you will also need to add `-A Win32`/`-A x64` option to CMake.
|
||||||
|
|
||||||
In Windows, use Vcpkg toolchain file by adding parameter -DCMAKE_TOOLCHAIN_FILE=<VCPKG_DIR>/scripts/buildsystems/vcpkg.cmake
|
In Windows, use Vcpkg toolchain file by adding parameter -DCMAKE_TOOLCHAIN_FILE=<VCPKG_DIR>/scripts/buildsystems/vcpkg.cmake
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user