From cc9565c13e0f91605bdc8ef83a06fa9cafdf3832 Mon Sep 17 00:00:00 2001 From: Dmytro Bogovych Date: Sun, 6 Oct 2019 18:03:14 +0300 Subject: [PATCH] - better CMake file --- platform_libs.cmake | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/platform_libs.cmake b/platform_libs.cmake index c796622..3a70712 100644 --- a/platform_libs.cmake +++ b/platform_libs.cmake @@ -10,6 +10,7 @@ if (CMAKE_SYSTEM MATCHES "Linux*") # uuid set (UUID_LIB ${CMAKE_CURRENT_LIST_DIR}/uuid/lib/lin64/libuuid.a) +<<<<<<< Updated upstream set (UUID_INCLUDE ${CMAKE_CURRENT_LIST_DIR}/uuid/include) # event2 @@ -30,4 +31,14 @@ if (CMAKE_SYSTEM MATCHES "Windows*") ${CMAKE_CURRENT_LIST_DIR}/sndfile/win32/static/vorbis.lib ${CMAKE_CURRENT_LIST_DIR}/sndfile/win32/static/vorbisfile.lib ${CMAKE_CURRENT_LIST_DIR}/sndfile/win32/static/vorbisenc.lib) +======= + + # Opus + set (OPUS_LIB ${CMAKE_CURRENT_LIST_DIR}/opus/linux/libopus.a) + set (OPUS_INCLUDE ${CMAKE_CURRENT_LIST_DIR}/opus/include) + + # Portaudio + set (PORTAUDIO_LIB ${CMAKE_CURRENT_LIST_DIR}/portaudio/linux/x64/libportaudio.a) + set (PORTAUDIO_INCLUDE ${CMAKE_CURRENT_LIST_DIR}/portaudio/include) +>>>>>>> Stashed changes endif()