mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-09-01 06:55:58 +00:00
Code Issues Releases Wiki Activity

Build tg_owt / tgcalls / tgvoip with C++20.

Browse Source
This commit is contained in:
John Preston
2021-11-12 12:20:28 +04:00
parent dbf673f674
commit dad11a17dd
4 changed files with 5 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/ThirdParty/tgcalls vendored

Submodule Telegram/ThirdParty/tgcalls updated: f340af67a0...b5906f03f3

2
Telegram/build/prepare/prepare.py
View File

@@ -1154,7 +1154,7 @@ mac:
stage('tg_owt', """ stage('tg_owt', """
git clone https://github.com/desktop-app/tg_owt.git git clone https://github.com/desktop-app/tg_owt.git
cd tg_owt cd tg_owt
git checkout d578c760dc git checkout ffbdaa616e
git submodule init git submodule init
git submodule update src/third_party/libvpx/source/libvpx src/third_party/libyuv git submodule update src/third_party/libvpx/source/libvpx src/third_party/libyuv
win: win:

18
Telegram/cmake/lib_tgcalls.cmake
View File

@@ -5,14 +5,7 @@
# https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL # https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
add_library(lib_tgcalls STATIC) add_library(lib_tgcalls STATIC)
init_target(lib_tgcalls) # Can't use std::optional::value on macOS.
if (WIN32)
init_target(lib_tgcalls) # Small amount of patches required here.
elseif (LINUX)
init_target(lib_tgcalls) # All C++20 on Linux, because otherwise ODR violation.
else()
init_target(lib_tgcalls cxx_std_14) # Can't use std::optional::value on macOS.
endif()
add_library(tdesktop::lib_tgcalls ALIAS lib_tgcalls) add_library(tdesktop::lib_tgcalls ALIAS lib_tgcalls)
@@ -250,14 +243,7 @@ PRIVATE
) )
add_library(lib_tgcalls_legacy STATIC) add_library(lib_tgcalls_legacy STATIC)
init_target(lib_tgcalls_legacy)
if (WIN32)
init_target(lib_tgcalls_legacy cxx_std_17) # Small amount of patches required here.
elseif (LINUX)
init_target(lib_tgcalls_legacy) # All C++20 on Linux, because otherwise ODR violation.
else()
init_target(lib_tgcalls_legacy cxx_std_14) # Can't use std::optional::value on macOS.
endif()
add_library(tdesktop::lib_tgcalls_legacy ALIAS lib_tgcalls_legacy) add_library(tdesktop::lib_tgcalls_legacy ALIAS lib_tgcalls_legacy)

9
Telegram/cmake/lib_tgvoip.cmake
View File

@@ -18,14 +18,7 @@ endif()
if (NOT TGVOIP_FOUND) if (NOT TGVOIP_FOUND)
add_library(lib_tgvoip_bundled STATIC) add_library(lib_tgvoip_bundled STATIC)
init_target(lib_tgvoip_bundled)
if (WIN32)
init_target(lib_tgvoip_bundled cxx_std_17) # Small amount of patches required here.
elseif (LINUX)
init_target(lib_tgvoip_bundled) # All C++20 on Linux, because otherwise ODR violation.
else()
init_target(lib_tgvoip_bundled cxx_std_14) # Can't use std::optional::value on macOS.
endif()
option(LIBTGVOIP_DISABLE_ALSA "Disable libtgvoip's ALSA backend (Linux only)." OFF) option(LIBTGVOIP_DISABLE_ALSA "Disable libtgvoip's ALSA backend (Linux only)." OFF)
option(LIBTGVOIP_DISABLE_PULSEAUDIO "Disable libtgvoip's PulseAudio backend (Linux only)." OFF) option(LIBTGVOIP_DISABLE_PULSEAUDIO "Disable libtgvoip's PulseAudio backend (Linux only)." OFF)