public
/
rtphone
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- fix linux build of support library 

- allow AMR codec usage to be configured from CMake
This commit is contained in:
Dmytro Bogovych 2018-09-11 17:36:09 +03:00
parent 6deceec404
commit 3164a7236d
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/CMakeLists.txt
View File

@ -55,6 +55,8 @@ set (CMAKE_CXX_STANDARD_REQUIRED ON)
set (rtphone_libs libs) set (rtphone_libs libs)
set (rtphone_engine engine) set (rtphone_engine engine)
set (USE_AMR_CODEC OFF CACHE BOOL "Use AMR codec. Requires libraries.")
set (RTPHONE_SOURCES set (RTPHONE_SOURCES
${rtphone_engine}/media/MT_Statistics.cpp ${rtphone_engine}/media/MT_Statistics.cpp
${rtphone_engine}/media/MT_WebRtc.cpp ${rtphone_engine}/media/MT_WebRtc.cpp
@ -115,7 +117,7 @@ endif (USE_AMR_CODEC)
target_link_libraries(rtphone ice_stack jrtplib g729_codec gsm_codec target_link_libraries(rtphone ice_stack jrtplib g729_codec gsm_codec
gsmhr_codec g722_codec srtp resiprocate gsmhr_codec g722_codec srtp resiprocate
helper_lib audio_lib webrtc speexdsp helper_lib audio_lib webrtc speexdsp
opus uuid) opus uuid ${LIBS})
target_include_directories(rtphone target_include_directories(rtphone

5
src/engine/helper/HL_Process.cpp
View File

@ -75,7 +75,12 @@ std::string OsProcess::execCommand(const std::string& cmd)
return output; return output;
} }
#else #else
#include <memory>
#include <stdexcept>
std::string OsProcess::execCommand(const std::string& cmd) std::string OsProcess::execCommand(const std::string& cmd)
{ {
std::string cp = cmd; std::string cp = cmd;