diff --git a/CMakeLists.txt b/CMakeLists.txt index a4151ca37..011429dea 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,7 +24,7 @@ find_package(GTK3 3.0 REQUIRED gtk) find_package(FFmpeg REQUIRED) find_package(Iconv REQUIRED) #@todo Turn into find_package(Opus REQUIRED) -find_library(OPUS opus) +find_library(OPUS_LIB opus) find_path(OPUS_INCLUDE_DIR opus.h PATHS /usr/local/include/opus) include_directories(${GTK3_INCLUDE_DIRS}) @@ -36,7 +36,7 @@ endif() if (NOT FFMPEG_SWRESAMPLE_FOUND) message(FATAL_ERROR "FFmpeg swresample is required") endif() -if (NOT OPUS) +if (NOT OPUS_LIB) message(FATAL_ERROR "opus codec is required") endif() diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt index 6c4ff7681..04a19b61a 100644 --- a/Telegram/CMakeLists.txt +++ b/Telegram/CMakeLists.txt @@ -585,7 +585,8 @@ add_executable(Telegram WIN32 MACOSX_BUNDLE target_compile_options(Telegram PRIVATE -Wno-c++1z-extensions) target_link_libraries(Telegram Qt5::Core Qt5::Widgets Qt5::Network) # crashpad::crashpad_client) -target_link_libraries(Telegram ${LIBLZMA_LIBRARIES} ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES} ${OPENAL_LIBRARY} ${FFMPEG_LIBRARIES} ${ICONV_LIBRARIES}) +target_link_libraries(Telegram ${LIBLZMA_LIBRARIES} ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES} + ${OPENAL_LIBRARY} ${FFMPEG_LIBRARIES} ${ICONV_LIBRARIES} ${OPUS_LIB}) target_link_libraries(Telegram tgvoip) add_dependencies(Telegram boxes_styles_output) @@ -597,8 +598,13 @@ if (APPLE) ) find_library(COREFOUNDATION_LIB CoreFoundation) find_library(COREAUDIO_LIB CoreAudio) + find_library(AUDIOUNIT_LIB AudioUnit) + find_library(AUDIOTOOLBOX_LIB AudioToolbox) find_library(COCOA_LIB Cocoa) - target_link_libraries(Telegram ${COREFOUNDATION_LIB} ${COREAUDIO_LIB} ${COCOA_LIB}) + find_library(CARBON_LIB Carbon) + find_library(IOKIT_LIB IOKit) + target_link_libraries(Telegram ${COREFOUNDATION_LIB} ${COCOA_LIB} ${CARBON_LIB} + ${COREAUDIO_LIB} ${AUDIOUNIT_LIB} ${AUDIOTOOLBOX_LIB} ${IOKIT_LIB}) endif() set_target_properties(Telegram