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

Remove webrtc test code usage on macOS.

This commit is contained in:
John Preston 2020-07-15 22:01:32 +04:00
parent 78c9c1e7f8
commit 7fec49a752
4 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/ThirdParty/tgcalls vendored

@ -1 +1 @@
Subproject commit 80c2b48f30b9ee21b75abf2afda09c5fc77b4145
Subproject commit 0b98641d4ccf2f2c7ea406e971ece81b229160ae

30
Telegram/cmake/lib_tgcalls.cmake
View File

@ -11,6 +11,8 @@ add_library(tdesktop::lib_tgcalls ALIAS lib_tgcalls)
set(tgcalls_dir ${third_party_loc}/tgcalls)
set(tgcalls_loc ${tgcalls_dir}/tgcalls)
target_compile_options(lib_tgcalls PRIVATE -fobjc-arc)
nice_target_sources(lib_tgcalls ${tgcalls_loc}
PRIVATE
CodecSelectHelper.cpp
@ -57,12 +59,16 @@ 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/VideoCameraCapturerMac.h
platform/darwin/VideoCameraCapturerMac.mm
platform/darwin/VideoCapturerInterfaceImpl.h
platform/darwin/VideoCapturerInterfaceImpl.mm
platform/darwin/VideoMetalView.h
platform/darwin/VideoMetalView.mm
platform/darwin/VideoMetalViewMac.h
platform/darwin/VideoMetalViewMac.mm
# Linux
@ -85,6 +91,18 @@ elseif (APPLE)
PRIVATE
WEBRTC_MAC
)
remove_target_sources(lib_tgcalls ${tgcalls_loc}
platform/darwin/VideoCameraCapturer.h
platform/darwin/VideoCameraCapturer.mm
platform/darwin/VideoMetalView.h
platform/darwin/VideoMetalView.mm
platform/darwin/VideoMetalViewMac.h
platform/darwin/VideoMetalViewMac.mm
platform/tdesktop/VideoCapturerTrackSource.cpp
platform/tdesktop/VideoCapturerTrackSource.h
platform/tdesktop/VideoCapturerInterfaceImpl.cpp
platform/tdesktop/VideoCapturerInterfaceImpl.h
)
else()
target_compile_definitions(lib_tgcalls
PRIVATE

2
Telegram/lib_webrtc

@ -1 +1 @@
Subproject commit 6c349a97466d3f38b7e7a4cb85a18a0b4e290b92
Subproject commit fa4c2e22d678d7a977b5f4572689e459be29b7e3

2
cmake

@ -1 +1 @@
Subproject commit ef2cfa49cb93b8aa4f51d18791033f38ac4b683b
Subproject commit fde8a86d2bb2613ae493e8185c2dfc2f798191ca