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

[sq] put back OpenAL

This commit is contained in:
Berkus Decker 2017-11-24 15:58:35 +02:00
parent 14a2bb250a
commit e2e836d9d2
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -16,6 +16,9 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
# Ignore automoc-ing generated files (@tbd?) # Ignore automoc-ing generated files (@tbd?)
cmake_policy(SET CMP0071 OLD) cmake_policy(SET CMP0071 OLD)
# Needs OpenAL-SOFT
# Install via `brew install openal-soft` and configure with `env OPENALDIR=/usr/local/opt/openal-soft`
find_package(OpenAL REQUIRED)
find_package(ZLIB REQUIRED) find_package(ZLIB REQUIRED)
find_package(LibZip REQUIRED) find_package(LibZip REQUIRED)
find_package(LibLZMA REQUIRED) find_package(LibLZMA REQUIRED)

22
Telegram/CMakeLists.txt
View File

@ -545,7 +545,7 @@ include_directories(ThirdParty/GSL/include ThirdParty/variant/include
include_directories(SourceFiles SourceFiles/core) include_directories(SourceFiles SourceFiles/core)
include_directories(${ZLIB_INCLUDE_DIRS} include_directories(${OPENAL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIRS}
${LIBZIP_INCLUDE_DIR_ZIP} ${LIBZIP_INCLUDE_DIR_ZIPCONF} ${LIBZIP_INCLUDE_DIR_ZIP} ${LIBZIP_INCLUDE_DIR_ZIPCONF}
${OPENSSL_INCLUDE_DIR} ${LIBLZMA_INCLUDE_DIRS} ${GTK3_INCLUDE_DIRS} ${OPENSSL_INCLUDE_DIR} ${LIBLZMA_INCLUDE_DIRS} ${GTK3_INCLUDE_DIRS}
${ICONV_INCLUDE_DIR} ${OPUS_INCLUDE_DIR}) ${ICONV_INCLUDE_DIR} ${OPUS_INCLUDE_DIR})
@ -557,7 +557,6 @@ include_directories(${ZLIB_INCLUDE_DIRS}
add_subdirectory(ThirdParty/libtgvoip) add_subdirectory(ThirdParty/libtgvoip)
# Shut up for testbuilding, remove me # Shut up for testbuilding, remove me
# include_directories(/usr/local/opt/openal-soft/include)
add_definitions(-Wno-switch) add_definitions(-Wno-switch)
# End remove me # End remove me
if (WIN32) if (WIN32)
@ -587,12 +586,19 @@ add_executable(Telegram WIN32 MACOSX_BUNDLE
# Disable a single annoying warning about c++17 # Disable a single annoying warning about c++17
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
target_link_libraries(Telegram ${LIBLZMA_LIBRARIES} ${ZLIB_LIBRARIES} Qt5::Core
${FFMPEG_LIBRARIES} ${ICONV_LIBRARIES} ${OPUS_LIB}) Qt5::Widgets
target_link_libraries(Telegram tgvoip) Qt5::Network
tgvoip
target_link_libraries(Telegram ${CONAN_LIBS}) ${LIBLZMA_LIBRARIES}
${ZLIB_LIBRARIES}
${OPENAL_LIBRARY}
${FFMPEG_LIBRARIES}
${ICONV_LIBRARIES}
${OPUS_LIB}
${CONAN_LIBS}
) # crashpad::crashpad_client)
add_dependencies(Telegram boxes_styles_output) add_dependencies(Telegram boxes_styles_output)