RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix build on macOS.

This commit is contained in:
John Preston 2020-07-13 18:04:02 +04:00
parent 6c272e38ad
commit 46550381a4
5 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/SourceFiles/calls/calls_call.cpp
View File

@ -675,7 +675,7 @@ void Call::createAndStartController(const MTPDphoneCall &call) {
#else // Q_OS_WIN
const auto callLogUtf = QFile::encodeName(callLogNative);
descriptor.config.logPath.resize(callLogUtf.size());
ranges::copy(callLogUtf, config.logPath.begin());
ranges::copy(callLogUtf, descriptor.config.logPath.begin());
#endif // Q_OS_WIN
QFile(callLogPath).remove();
QDir().mkpath(callLogFolder);

2
Telegram/ThirdParty/tgcalls vendored

@ -1 +1 @@
Subproject commit 77f3411be90234a90cf0479d17e26bbad7106de3
Subproject commit dc2d21160e5ff64ecd13f12afe7b34ad2cb1b0a1

34
Telegram/cmake/lib_tgcalls.cmake
View File

@ -35,12 +35,12 @@ PRIVATE
VideoCapturerInterface.h
platform/PlatformInterface.h
platform/tdesktop/VideoCapturerInterfaceImpl.cpp
platform/tdesktop/VideoCapturerInterfaceImpl.h
# Windows
platform/windows/WindowsInterface.cpp
platform/windows/WindowsInterface.h
platform/windows/VideoCapturerInterfaceImpl.cpp
platform/windows/VideoCapturerInterfaceImpl.h
# iOS / macOS
platform/darwin/DarwinInterface.h
@ -53,22 +53,38 @@ PRIVATE
platform/darwin/TGRTCVideoDecoderH265.mm
platform/darwin/TGRTCVideoEncoderH265.h
platform/darwin/TGRTCVideoEncoderH265.mm
platform/darwin/VideoCameraCapturer.h
platform/darwin/VideoCameraCapturer.mm
platform/darwin/VideoCapturerInterfaceImpl.h
platform/darwin/VideoCapturerInterfaceImpl.mm
platform/darwin/VideoMetalView.h
platform/darwin/VideoMetalView.mm
# platform/darwin/VideoCameraCapturer.h
# platform/darwin/VideoCameraCapturer.mm
# platform/darwin/VideoCapturerInterfaceImpl.h
# platform/darwin/VideoCapturerInterfaceImpl.mm
# platform/darwin/VideoMetalView.h
# platform/darwin/VideoMetalView.mm
# Linux
# POSIX
)
target_compile_definitions(lib_tgcalls
PRIVATE
WEBRTC_APP_TDESKTOP
RTC_ENABLE_VP9
)
if (WIN32)
target_compile_definitions(lib_tgcalls
PRIVATE
TARGET_OS_WIN
WEBRTC_WIN
)
elseif (APPLE)
target_compile_definitions(lib_tgcalls
PRIVATE
WEBRTC_MAC
)
else()
target_compile_definitions(lib_tgcalls
PRIVATE
WEBRTC_LINUX
)
endif()

2
Telegram/lib_webrtc

@ -1 +1 @@
Subproject commit 078f6bf15d60c23f9907d91398bfd6bf201638be
Subproject commit 6c349a97466d3f38b7e7a4cb85a18a0b4e290b92

2
cmake

@ -1 +1 @@
Subproject commit 8414d2aa3a51511076de41e65fc10f4821cc67b3
Subproject commit bff30ad53b5097718b6151bd15ab4ad3a0ddf807