diff options
| author | Gerald Combs <gerald@wireshark.org> | 2014-12-09 13:22:20 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2014-12-09 21:25:19 +0000 |
| commit | 3147087de323c0294b51006f97b641fc408f1b06 (patch) | |
| tree | 345244e372663b9713cba86b4dc216f8bebdca31 /codecs | |
| parent | f66de3a7495c6751a8e6b4092d4617c8adc05cc3 (diff) | |
| download | wireshark-3147087de323c0294b51006f97b641fc408f1b06.tar.gz | |
Fix ranlib "has no symbols" errors in the codecs directory.
Don't build the G.722 or G.726 codecs for now. Each are wrapped in
"#ifdef HAVE_SPANDSP", which we don't define.
Conditionally compile the SBC codec.
Change-Id: I5f09ff66514f967d4f0611c943b4e6a975b8994b
Reviewed-on: https://code.wireshark.org/review/5690
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'codecs')
| -rw-r--r-- | codecs/CMakeLists.txt | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/codecs/CMakeLists.txt b/codecs/CMakeLists.txt index e4eec87037..eea8f145e3 100644 --- a/codecs/CMakeLists.txt +++ b/codecs/CMakeLists.txt @@ -23,11 +23,16 @@ set(CODECS_FILES codecs.c G711a/G711adecode.c G711u/G711udecode.c - G722/G722decode.c - G726/G726decode.c - sbc/sbc.c + # These are wrapped in "#ifdef HAVE_SPANDSP", which we don't currently + # handle or define. + # G722/G722decode.c + # G726/G726decode.c ) +if(SBC_FOUND) + set(CODECS_FILES ${CODECS_FILES} sbc/sbc.c) +endif() + add_library(codecs STATIC ${CODECS_FILES} ) |