void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-07 23:53:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update tgcalls, don't link libtgvoip any more.

Browse source
This commit is contained in:
John Preston 2025-04-18 09:01:33 +04:00
parent 4f0fa66575
commit 98d71308a8
4 changed files with 21 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Telegram/CMakeLists.txt
View file

@ -26,7 +26,6 @@ get_filename_component(res_loc Resources REALPATH)
include(cmake/telegram_options.cmake) include(cmake/telegram_options.cmake)
include(cmake/lib_ffmpeg.cmake) include(cmake/lib_ffmpeg.cmake)
include(cmake/lib_stripe.cmake) include(cmake/lib_stripe.cmake)
include(cmake/lib_tgvoip.cmake)
include(cmake/lib_tgcalls.cmake) include(cmake/lib_tgcalls.cmake)
include(cmake/lib_prisma.cmake) include(cmake/lib_prisma.cmake)
include(cmake/td_export.cmake) include(cmake/td_export.cmake)
@ -54,9 +53,9 @@ set_target_properties(Telegram PROPERTIES AUTOMOC ON)
target_link_libraries(Telegram target_link_libraries(Telegram
PRIVATE PRIVATE
tdesktop::lib_tgcalls_legacy # tdesktop::lib_tgcalls_legacy
tdesktop::lib_tgcalls tdesktop::lib_tgcalls
tdesktop::lib_tgvoip # tdesktop::lib_tgvoip
# Order in this list defines the order of include paths in command line. # Order in this list defines the order of include paths in command line.
# We need to place desktop-app::external_minizip this early to have its # We need to place desktop-app::external_minizip this early to have its

4
Telegram/SourceFiles/calls/calls_call.cpp
View file

@ -41,8 +41,6 @@ namespace tgcalls {
class InstanceImpl; class InstanceImpl;
class InstanceV2Impl; class InstanceV2Impl;
class InstanceV2ReferenceImpl; class InstanceV2ReferenceImpl;
class InstanceImplLegacy;
void SetLegacyGlobalServerConfig(const std::string &serverConfig);
} // namespace tgcalls } // namespace tgcalls
namespace Calls { namespace Calls {
@ -57,7 +55,6 @@ const auto kDefaultVersion = "2.4.4"_q;
const auto Register = tgcalls::Register<tgcalls::InstanceImpl>(); const auto Register = tgcalls::Register<tgcalls::InstanceImpl>();
const auto RegisterV2 = tgcalls::Register<tgcalls::InstanceV2Impl>(); const auto RegisterV2 = tgcalls::Register<tgcalls::InstanceV2Impl>();
const auto RegV2Ref = tgcalls::Register<tgcalls::InstanceV2ReferenceImpl>(); const auto RegV2Ref = tgcalls::Register<tgcalls::InstanceV2ReferenceImpl>();
const auto RegisterLegacy = tgcalls::Register<tgcalls::InstanceImplLegacy>();
[[nodiscard]] base::flat_set<int64> CollectEndpointIds( [[nodiscard]] base::flat_set<int64> CollectEndpointIds(
const QVector<MTPPhoneConnection> &list) { const QVector<MTPPhoneConnection> &list) {
@ -1637,7 +1634,6 @@ Call::~Call() {
} }
void UpdateConfig(const std::string &data) { void UpdateConfig(const std::string &data) {
tgcalls::SetLegacyGlobalServerConfig(data);
} }
} // namespace Calls } // namespace Calls

2
Telegram/ThirdParty/tgcalls vendored

@ -1 +1 @@
Subproject commit ea93dec2c8910197681ae785fd05a864e27d3db9 Subproject commit 1348de6aa6c07ed32354d3e26423c45304000a39

36
Telegram/cmake/lib_tgcalls.cmake
View file

@ -281,25 +281,25 @@ PRIVATE
${tgcalls_loc} ${tgcalls_loc}
) )
add_library(lib_tgcalls_legacy STATIC) # add_library(lib_tgcalls_legacy STATIC)
init_target(lib_tgcalls_legacy) # init_target(lib_tgcalls_legacy)
add_library(tdesktop::lib_tgcalls_legacy ALIAS lib_tgcalls_legacy) # add_library(tdesktop::lib_tgcalls_legacy ALIAS lib_tgcalls_legacy)
nice_target_sources(lib_tgcalls_legacy ${tgcalls_loc} # nice_target_sources(lib_tgcalls_legacy ${tgcalls_loc}
PRIVATE # PRIVATE
legacy/InstanceImplLegacy.cpp # legacy/InstanceImplLegacy.cpp
legacy/InstanceImplLegacy.h # legacy/InstanceImplLegacy.h
) # )
target_include_directories(lib_tgcalls_legacy # target_include_directories(lib_tgcalls_legacy
PRIVATE # PRIVATE
${tgcalls_loc} # ${tgcalls_loc}
) # )
target_link_libraries(lib_tgcalls_legacy # target_link_libraries(lib_tgcalls_legacy
PRIVATE # PRIVATE
tdesktop::lib_tgcalls # tdesktop::lib_tgcalls
tdesktop::lib_tgvoip # tdesktop::lib_tgvoip
desktop-app::external_openssl # desktop-app::external_openssl
) # )