procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Link in opus and a bunch of OSX frameworks

This commit is contained in:
Berkus Decker 2017-11-23 23:56:33 +02:00
parent ac7cb4d79d
commit b06dcb5bac
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -24,7 +24,7 @@ find_package(GTK3 3.0 REQUIRED gtk)
find_package(FFmpeg REQUIRED) find_package(FFmpeg REQUIRED)
find_package(Iconv REQUIRED) find_package(Iconv REQUIRED)
#@todo Turn into find_package(Opus 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) find_path(OPUS_INCLUDE_DIR opus.h PATHS /usr/local/include/opus)
include_directories(${GTK3_INCLUDE_DIRS}) include_directories(${GTK3_INCLUDE_DIRS})
@ -36,7 +36,7 @@ endif()
if (NOT FFMPEG_SWRESAMPLE_FOUND) if (NOT FFMPEG_SWRESAMPLE_FOUND)
message(FATAL_ERROR "FFmpeg swresample is required") message(FATAL_ERROR "FFmpeg swresample is required")
endif() endif()
if (NOT OPUS) if (NOT OPUS_LIB)
message(FATAL_ERROR "opus codec is required") message(FATAL_ERROR "opus codec is required")
endif() endif()

10
Telegram/CMakeLists.txt
View File

@ -585,7 +585,8 @@ add_executable(Telegram WIN32 MACOSX_BUNDLE
target_compile_options(Telegram PRIVATE -Wno-c++1z-extensions) 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 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) target_link_libraries(Telegram tgvoip)
add_dependencies(Telegram boxes_styles_output) add_dependencies(Telegram boxes_styles_output)
@ -597,8 +598,13 @@ if (APPLE)
) )
find_library(COREFOUNDATION_LIB CoreFoundation) find_library(COREFOUNDATION_LIB CoreFoundation)
find_library(COREAUDIO_LIB CoreAudio) find_library(COREAUDIO_LIB CoreAudio)
find_library(AUDIOUNIT_LIB AudioUnit)
find_library(AUDIOTOOLBOX_LIB AudioToolbox)
find_library(COCOA_LIB Cocoa) 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() endif()
set_target_properties(Telegram set_target_properties(Telegram