diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2019-02-02 14:52:07 +0000 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2019-05-02 21:12:01 +0000 |
| commit | 186f985793cceb7d7222955987df72ab5a82beeb (patch) | |
| tree | ff6c744a7d5ee356b5bc6e8632916bbb68a6ca30 /ui | |
| parent | 854479a7dcd198fa2f167a7845e22688d2f710d5 (diff) | |
CMake: Check for and use system SpeexDSP library
Change-Id: I8443379d23a2946dd21c12e5e0bd5464ab73ca25
Reviewed-on: https://code.wireshark.org/review/31857
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/qt/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | ui/qt/main.cpp | 6 | ||||
| -rw-r--r-- | ui/qt/rtp_audio_stream.cpp | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/ui/qt/CMakeLists.txt b/ui/qt/CMakeLists.txt index 2af1eb4cb5..226e51f830 100644 --- a/ui/qt/CMakeLists.txt +++ b/ui/qt/CMakeLists.txt @@ -663,6 +663,7 @@ target_include_directories(qtui SYSTEM PUBLIC ${QT_INCLUDE_DIRS} ${WINSPARKLE_INCLUDE_DIRS} + ${SPEEXDSP_INCLUDE_DIRS} PRIVATE ${PCAP_INCLUDE_DIRS} ) diff --git a/ui/qt/main.cpp b/ui/qt/main.cpp index db0a123ffe..8026b9f4fb 100644 --- a/ui/qt/main.cpp +++ b/ui/qt/main.cpp @@ -235,6 +235,12 @@ get_gui_compiled_info(GString *str) #endif #endif /* _WIN32 */ +#ifdef HAVE_SPEEXDSP + g_string_append(str, ", with SpeexDSP (using system library)"); +#else + g_string_append(str, ", with SpeexDSP (using bundled resampler)"); +#endif + codec_get_compiled_version_info(str); } diff --git a/ui/qt/rtp_audio_stream.cpp b/ui/qt/rtp_audio_stream.cpp index 3f05cfd9cc..f5ed020b38 100644 --- a/ui/qt/rtp_audio_stream.cpp +++ b/ui/qt/rtp_audio_stream.cpp @@ -14,7 +14,7 @@ #ifdef HAVE_SPEEXDSP #include <speex/speex_resampler.h> #else -#include <codecs/speex/speex_resampler.h> +#include "../../speexdsp/speex_resampler.h" #endif /* HAVE_SPEEXDSP */ #include <epan/rtp_pt.h> |