From 3d42742689dfe427464636223f1f71f2e7cbb52a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20M=C3=BCllenhaupt?= Date: Thu, 16 Feb 2017 11:34:14 +0100 Subject: [PATCH] remove audio_coding/test/utility.cc object files to fix multiple definition linking error of webrtc::CircularBuffer --- libwebrtc/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libwebrtc/CMakeLists.txt b/libwebrtc/CMakeLists.txt index 663fb36..08e316e 100644 --- a/libwebrtc/CMakeLists.txt +++ b/libwebrtc/CMakeLists.txt @@ -17,9 +17,11 @@ file(GLOB_RECURSE _OBJ_EXCLUDED ${WEBRTC_OUTPUT_DIR}/obj/third_party/yasm/re2c/*${_OBJ_EXT} ${WEBRTC_OUTPUT_DIR}/obj/third_party/yasm/yasm/*${_OBJ_EXT} ${WEBRTC_OUTPUT_DIR}/obj/third_party/protobuf/protoc/*${_OBJ_EXT} - ${WEBRTC_OUTPUT_DIR}/obj/third_party/protobuf/protobuf_lite/*${_OBJ_EXT} + ${WEBRTC_OUTPUT_DIR}/obj/third_party/protobuf/protobuf_full/*${_OBJ_EXT} ${WEBRTC_OUTPUT_DIR}/obj/webrtc/examples/*${_OBJ_EXT} ${WEBRTC_OUTPUT_DIR}/obj/webrtc/tools/*${_OBJ_EXT} + ${WEBRTC_OUTPUT_DIR}/obj/webrtc/modules/audio_coding/delay_test/utility${_OBJ_EXT} + ${WEBRTC_OUTPUT_DIR}/obj/webrtc/modules/modules_tests/utility${_OBJ_EXT} ${WEBRTC_OUTPUT_DIR}/obj/webrtc/modules/video_capture/video_capture/video_capture_external${_OBJ_EXT} ${WEBRTC_OUTPUT_DIR}/obj/webrtc/modules/video_capture/video_capture/device_info_external${_OBJ_EXT})