From 67caeb6e3cda44205ba8fe783274b20dc7ea216e Mon Sep 17 00:00:00 2001 From: jacqueline Date: Wed, 9 Aug 2023 12:00:02 +1000 Subject: Use opusfile instead of working directly with ogg and opus --- src/codecs/CMakeLists.txt | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'src/codecs/CMakeLists.txt') diff --git a/src/codecs/CMakeLists.txt b/src/codecs/CMakeLists.txt index 9f0febb9..91d3f319 100644 --- a/src/codecs/CMakeLists.txt +++ b/src/codecs/CMakeLists.txt @@ -3,20 +3,8 @@ # SPDX-License-Identifier: GPL-3.0-only idf_component_register( - SRCS "codec.cpp" "mad.cpp" "foxenflac.cpp" "opus.cpp" "ogg.cpp" "vorbis.cpp" + SRCS "codec.cpp" "mad.cpp" "foxenflac.cpp" "opus.cpp" "vorbis.cpp" INCLUDE_DIRS "include" - REQUIRES "result" "span" "libmad" "libfoxenflac" "tremor" "ogg") + REQUIRES "result" "span" "libmad" "libfoxenflac" "tremor" "opusfile") target_compile_options("${COMPONENT_LIB}" PRIVATE ${EXTRA_WARNINGS}) - -set(CMAKE_POLICY_DEFAULT_CMP0077 NEW) - -set(OPUS_FIXED_POINT ON) -set(OPUS_ENABLE_FLOAT_API OFF) -set(OPUS_INSTALL_PKG_CONFIG_MODULE OFF) -set(OPUS_INSTALL_CMAKE_CONFIG_MODULE OFF) -set(OPUS_BUILD_TESTING OFF) -set(OPUS_BUILD_SHARED_LIBS OFF) - -add_subdirectory($ENV{PROJ_PATH}/lib/opus ${CMAKE_CURRENT_BINARY_DIR}/opus) -target_link_libraries(${COMPONENT_LIB} PUBLIC opus) -- cgit v1.2.3