From bc8d04bb1fbfe79a8cbc61440258a58fb040202f Mon Sep 17 00:00:00 2001 From: yumirak Date: Mon, 25 Aug 2025 13:56:49 +0000 Subject: [PATCH] cmake: define USE_CODEC regardless of USE_INTERNAL --- cmake/libraries/opus.cmake | 7 ++++--- cmake/libraries/vorbis.cmake | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/cmake/libraries/opus.cmake b/cmake/libraries/opus.cmake index 55508409..61835f2f 100644 --- a/cmake/libraries/opus.cmake +++ b/cmake/libraries/opus.cmake @@ -19,13 +19,14 @@ if(USE_INTERNAL_OPUS) find_include_dirs(OPUS_INCLUDE_DIRS ${OPUS_SOURCES}) find_include_dirs(OPUSFILE_INCLUDE_DIRS ${OPUSFILE_SOURCES}) set(OPUS_INCLUDE_DIRS ${OPUS_INCLUDE_DIRS} ${OPUSFILE_INCLUDE_DIRS} ${INTERNAL_OPUSFILE_DIR}/include) - set(OPUS_DEFINITIONS USE_CODEC_OPUS OPUS_BUILD HAVE_LRINTF FLOATING_POINT FLOAT_APPROX USE_ALLOCA) + set(OPUS_DEFINITIONS OPUS_BUILD HAVE_LRINTF FLOATING_POINT FLOAT_APPROX USE_ALLOCA) list(APPEND CLIENT_LIBRARY_SOURCES ${OPUS_SOURCES} ${OPUSFILE_SOURCES}) else() find_package(PkgConfig REQUIRED) pkg_check_modules(OPUS REQUIRED opus) + pkg_check_modules(OPUSFILE REQUIRED opusfile) endif() -list(APPEND CLIENT_LIBRARIES ${OPUS_LIBRARIES}) +list(APPEND CLIENT_LIBRARIES ${OPUS_LIBRARIES} ${OPUSFILE_LIBRARIES}) list(APPEND CLIENT_INCLUDE_DIRS ${OPUS_INCLUDE_DIRS}) -list(APPEND CLIENT_DEFINITIONS ${OPUS_DEFINITIONS}) +list(APPEND CLIENT_DEFINITIONS USE_CODEC_OPUS ${OPUS_DEFINITIONS}) diff --git a/cmake/libraries/vorbis.cmake b/cmake/libraries/vorbis.cmake index 93b43611..d2067d22 100644 --- a/cmake/libraries/vorbis.cmake +++ b/cmake/libraries/vorbis.cmake @@ -14,13 +14,13 @@ if(USE_INTERNAL_VORBIS) file(GLOB_RECURSE VORBIS_SOURCES ${INTERNAL_VORBIS_DIR}/*.c) disable_warnings(${VORBIS_SOURCES}) set(VORBIS_INCLUDE_DIRS ${INTERNAL_VORBIS_DIR}/include ${INTERNAL_VORBIS_DIR}/lib) - set(VORBIS_DEFINITIONS USE_CODEC_VORBIS) list(APPEND CLIENT_LIBRARY_SOURCES ${VORBIS_SOURCES}) else() find_package(PkgConfig REQUIRED) pkg_check_modules(VORBIS REQUIRED vorbis) + pkg_check_modules(VORBISFILE REQUIRED vorbisfile) endif() -list(APPEND CLIENT_LIBRARIES ${VORBIS_LIBRARIES}) +list(APPEND CLIENT_LIBRARIES ${VORBIS_LIBRARIES} ${VORBISFILE_LIBRARIES}) list(APPEND CLIENT_INCLUDE_DIRS ${VORBIS_INCLUDE_DIRS}) -list(APPEND CLIENT_DEFINITIONS ${VORBIS_DEFINITIONS}) +list(APPEND CLIENT_DEFINITIONS USE_CODEC_VORBIS ${VORBIS_DEFINITIONS})