From 3147087de323c0294b51006f97b641fc408f1b06 Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Tue, 9 Dec 2014 13:22:20 -0800 Subject: 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 --- codecs/CMakeLists.txt | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'codecs') 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} ) -- cgit v1.2.3