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

Use OpenAL-provided cmake config, update readme

This commit is contained in:
Berkus Decker 2017-12-03 19:36:07 +02:00 committed by Berkus Decker
parent 6b6a0475ab
commit fb783cfd64
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -23,8 +23,8 @@ if (CMAKE_VERSION VERSION_GREATER 3.9)
endif() endif()
# Needs OpenAL-SOFT # Needs OpenAL-SOFT
# Install via `brew install openal-soft` and configure with `env OPENALDIR=/usr/local/opt/openal-soft` # Install via `brew install openal-soft` and configure with cmake call from README.md
find_package(OpenAL REQUIRED) find_package(OpenAL REQUIRED NO_MODULE)
find_package(ZLIB REQUIRED) find_package(ZLIB REQUIRED)
find_package(OpenSSL REQUIRED) find_package(OpenSSL REQUIRED)
find_package(FFmpeg REQUIRED) find_package(FFmpeg REQUIRED)

8
README.md
View File

@ -4,11 +4,13 @@ This is the complete source code and the build instructions for the alpha versio
## Build instructions ## Build instructions
Must have OpenAL-soft and Qt5 installed. Provide paths to them in CMAKE_PREFIX_PATH variable when configuring.
ccache -o sloppiness=pch_defines,time_macros ccache -o sloppiness=pch_defines,time_macros
mkdir _build_ mkdir _conan_build_
cd _build_ cd _conan_build_
conan install .. --build missing conan install .. --build missing
cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug -DCMAKE_PREFIX_PATH=/usr/local/opt/qt5/ .. cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug -DCMAKE_PREFIX_PATH="/usr/local/opt/qt5/;/usr/local/opt/openal-soft" ..
ninja ninja
[![Version](https://badge.fury.io/gh/telegramdesktop%2Ftdesktop.svg)](https://github.com/telegramdesktop/tdesktop/releases) [![Version](https://badge.fury.io/gh/telegramdesktop%2Ftdesktop.svg)](https://github.com/telegramdesktop/tdesktop/releases)

8
Telegram/CMakeLists.txt
View File

@ -547,7 +547,7 @@ include_directories(ThirdParty/GSL/include ThirdParty/variant/include
include_directories(SourceFiles SourceFiles/core) include_directories(SourceFiles SourceFiles/core)
include_directories(${OPENAL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIRS} include_directories(${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} ${OPENSSL_INCLUDE_DIR} ${LIBLZMA_INCLUDE_DIRS}
${ICONV_INCLUDE_DIR} ${OPUS_INCLUDE_DIR} ${ICONV_INCLUDE_DIR} ${OPUS_INCLUDE_DIR}
@ -555,10 +555,6 @@ include_directories(${OPENAL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIRS}
add_subdirectory(ThirdParty/libtgvoip) add_subdirectory(ThirdParty/libtgvoip)
# Shut up for testbuilding, remove me
include_directories(/usr/local/opt/openal-soft/include)
# End remove me
if(NOT WIN32) if(NOT WIN32)
add_definitions(-Wno-switch) add_definitions(-Wno-switch)
endif() endif()
@ -620,7 +616,7 @@ target_link_libraries(Telegram
Qt5::Network Qt5::Network
Qt5::GuiPrivate Qt5::GuiPrivate
tgvoip tgvoip
${OPENAL_LIBRARY} OpenAL::OpenAL
${FFMPEG_LIBRARIES} ${FFMPEG_LIBRARIES}
${ZLIB_LIBRARIES} ${ZLIB_LIBRARIES}
${SWRESAMPLE_LIBRARIES} ${SWRESAMPLE_LIBRARIES}