From d46ad2cfb5d577543d862045fbcb783dbecb9794 Mon Sep 17 00:00:00 2001 From: Berkus Decker Date: Tue, 28 Nov 2017 02:41:29 +0200 Subject: [PATCH] Specify ffmpeg flags and defines --- Telegram/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt index 80be8f640..94ad0d54e 100644 --- a/Telegram/CMakeLists.txt +++ b/Telegram/CMakeLists.txt @@ -540,10 +540,8 @@ include_directories(SourceFiles SourceFiles/core) include_directories(${OPENAL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIRS} ${LIBZIP_INCLUDE_DIR_ZIP} ${LIBZIP_INCLUDE_DIR_ZIPCONF} ${OPENSSL_INCLUDE_DIR} ${LIBLZMA_INCLUDE_DIRS} - ${ICONV_INCLUDE_DIR} ${OPUS_INCLUDE_DIR}) - # ${FFMPEG_INCLUDE_DIR}) -- this doesn't work, wtf? - -# link_directories(${FFMPEG_LIBRARY_DIR}) + ${ICONV_INCLUDE_DIR} ${OPUS_INCLUDE_DIR} + ${FFMPEG_INCLUDE_DIRS}) add_subdirectory(ThirdParty/libtgvoip) @@ -600,6 +598,8 @@ else() target_compile_options(Telegram PRIVATE /std:c++14) endif() +target_compile_definitions(Telegram PRIVATE ${FFMPEG_DEFINITIONS}) + target_link_libraries(Telegram Qt5::Core Qt5::Widgets