diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index bce6cf7..3521f29 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -65,7 +65,6 @@ endif() add_checked_subdirectory(ton) add_checked_subdirectory(variant) add_checked_subdirectory(webrtc) -add_checked_subdirectory(webview) if (LINUX AND NOT DESKTOP_APP_DISABLE_X11_INTEGRATION) add_checked_subdirectory(xcb) endif() diff --git a/external/hime_qt/hime_im_client/CMakeLists.txt b/external/hime_qt/hime_im_client/CMakeLists.txt index c90c717..cb4a55b 100644 --- a/external/hime_qt/hime_im_client/CMakeLists.txt +++ b/external/hime_qt/hime_im_client/CMakeLists.txt @@ -34,7 +34,7 @@ else() ) find_package(PkgConfig REQUIRED) - pkg_search_module(GTK REQUIRED gtk+-2.0 gtk+-3.0) + pkg_search_module(GTK REQUIRED gtk+-3.0) target_include_directories(external_hime_im_client PUBLIC diff --git a/external/webrtc/CMakeLists.txt b/external/webrtc/CMakeLists.txt index 7809d79..b11fd21 100644 --- a/external/webrtc/CMakeLists.txt +++ b/external/webrtc/CMakeLists.txt @@ -21,6 +21,7 @@ else() RTC_ENABLE_VP9 HAVE_SCTP WEBRTC_USE_H264 + WEBRTC_USE_BUILTIN_ISAC_FLOAT WEBRTC_LIBRARY_IMPL WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=1 ABSL_ALLOCATOR_NOTHROW=1 @@ -47,6 +48,7 @@ else() target_compile_definitions(external_webrtc INTERFACE WEBRTC_LINUX + WEBRTC_USE_X11 ) endif() @@ -78,6 +80,14 @@ else() list(APPEND webrtc_libs_list "${webrtc_build_loc}/${lib}${webrtc_lib_suffix}") endforeach() + target_link_libraries(external_webrtc + INTERFACE + ${webrtc_libs_list} + desktop-app::external_openssl + desktop-app::external_jpeg + desktop-app::external_opus + ) + if (WIN32) target_link_libraries(external_webrtc INTERFACE @@ -92,13 +102,17 @@ else() INTERFACE -ObjC ) + else() + # Required for desktop_capture + target_link_static_libraries(external_webrtc + INTERFACE + Xcomposite + Xdamage + Xext + Xfixes + Xrandr + Xrender + Xtst + ) endif() - - target_link_libraries(external_webrtc - INTERFACE - ${webrtc_libs_list} - desktop-app::external_openssl - desktop-app::external_jpeg - desktop-app::external_opus - ) endif() diff --git a/external/webview/CMakeLists.txt b/external/webview/CMakeLists.txt deleted file mode 100644 index d0990b8..0000000 --- a/external/webview/CMakeLists.txt +++ /dev/null @@ -1,39 +0,0 @@ -# This file is part of Desktop App Toolkit, -# a set of libraries for developing nice desktop applications. -# -# For license and copyright information please follow this link: -# https://github.com/desktop-app/legal/blob/master/LEGAL - -add_library(external_webview INTERFACE IMPORTED GLOBAL) -add_library(desktop-app::external_webview ALIAS external_webview) - -add_library(external_webview_bundled INTERFACE) - -set(webview_loc ${third_party_loc}/webview) - -if (WIN32) - target_include_directories(external_webview_bundled - INTERFACE - ${webview_loc}/script/microsoft.web.webview2.1.0.664.37/build/native/include - ) - - if (build_win64) - set(webview_arch x64) - else() - set(webview_arch x86) - endif() - target_link_libraries(external_webview_bundled - INTERFACE - ${webview_loc}/script/microsoft.web.webview2.1.0.664.37/build/native/${webview_arch}/WebView2LoaderStatic.lib - ) -endif() - -target_include_directories(external_webview_bundled -INTERFACE - ${webview_loc} -) - -target_link_libraries(external_webview -INTERFACE - external_webview_bundled -)