From fbb848d9406cd95c0493e159c12122d7722ee971 Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Sat, 29 Aug 2020 18:12:56 +0100 Subject: [PATCH] Add codec2 library for Windows. Export AudioResampler class. --- CMakeLists.txt | 5 +++++ cmake/cpack/CMakeLists.txt | 8 ++++++++ sdrbase/audio/audioresampler.h | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a332c65d9..5b9fcd15d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -225,6 +225,11 @@ elseif (WIN32) set(OpenCV_DIR "${EXTERNAL_LIBRARY_FOLDER}/opencv" CACHE INTERNAL "") set(PKG_CONFIG_EXECUTABLE "${EXTERNAL_LIBRARY_FOLDER}/pkg-config-lite/bin/pkg-config.exe" CACHE INTERNAL "") + set(CODEC2_FOUND ON CACHE INTERNAL "") + set(CODEC2_INCLUDE_DIR "${EXTERNAL_LIBRARY_FOLDER}/codec2/include" CACHE INTERNAL "") + set(CODEC2_LIBRARIES "${EXTERNAL_LIBRARY_FOLDER}/codec2/lib/codec2.lib" CACHE INTERNAL "") + set(CODEC2_DLL_DIR "${EXTERNAL_LIBRARY_FOLDER}/codec2/lib" CACHE INTERNAL "") + # ffmpeg set(FFMPEG_INCLUDE_DIRS "${EXTERNAL_LIBRARY_FOLDER}/ffmpeg/include" CACHE INTERNAL "") set(FFMPEG_LIBRARIES "${EXTERNAL_LIBRARY_FOLDER}/ffmpeg/bin" CACHE INTERNAL "") diff --git a/cmake/cpack/CMakeLists.txt b/cmake/cpack/CMakeLists.txt index fbab1bfae..5611cda4f 100644 --- a/cmake/cpack/CMakeLists.txt +++ b/cmake/cpack/CMakeLists.txt @@ -211,6 +211,14 @@ elseif(WIN32 OR MINGW) ) endforeach(opencv_dll) + file(GLOB CODEC2_DLLS "${CODEC2_DLL_DIR}/*${CMAKE_SHARED_LIBRARY_SUFFIX}") + foreach(codec2_dll ${CODEC2_DLLS}) + get_filename_component(codec2_dll_name "${codec2_dll}" NAME) + add_custom_target(copy_codec2_${codec2_dll_name} ALL + COMMAND ${CMAKE_COMMAND} -E copy_if_different "${codec2_dll}" "${SDRANGEL_BINARY_BIN_DIR}/" + ) + endforeach(codec2_dll) + # TODO we need a way to fixup_bundle() on the build bin/ directory without call install if(BUILD_GUI) install(CODE " diff --git a/sdrbase/audio/audioresampler.h b/sdrbase/audio/audioresampler.h index 4745f1c2c..eac33763b 100644 --- a/sdrbase/audio/audioresampler.h +++ b/sdrbase/audio/audioresampler.h @@ -22,7 +22,7 @@ #include "dsp/dsptypes.h" #include "audiofilter.h" -class AudioResampler +class SDRBASE_API AudioResampler { public: AudioResampler();